diff --git a/doc/util/Makefile.am b/doc/util/Makefile.am
index 29e52dd..6ab89ba 100644
--- a/doc/util/Makefile.am
+++ b/doc/util/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = block.awk fixindex.awk mkindex.c tmac.index tmac.scheme
+EXTRA_DIST = block.awk fixindex.awk mkindex.awk tmac.index tmac.scheme
diff --git a/doc/util/mkindex.awk b/doc/util/mkindex.awk
new file mode 100755
index 0000000..29af972
--- /dev/null
+++ b/doc/util/mkindex.awk
@@ -0,0 +1,107 @@
+#! /usr/bin/awk -f
+
+# mkindex.awk: Copy named files or standard input (if no arguments are
+# given) to standard output, replacing @[something] by troff macro calls.
+# $Id$
+#
+# These replacements are performed:
+#
+# @[.something]   -->  \n.Ix "something"\nsomething
+# @[!something]   -->  \n.Id "something"\nsomething
+#
+# @[.some|thing]  -->  \n.Ix "thing, some"\nsome thing
+# @[!some|thing]  -->  \n.Id "thing, some"\nsome thing
+#
+# @[.=something]  -->  \n.Ix "something"\n
+# @[!=something]  -->  \n.Id "something"\n
+#
+#
+#  1)  initial \n is omitted at the beginning of an output line
+#
+#  2)  initial \n is prefixed by \c if @[ follows "(" in input
+#
+#  3)  omit final \n if @[...] is at end of input line
+#
+#  4)  within @[...], \] is replaced by ]
+#
+#  5)  in the macro argument ("something"), all sequences of the form
+#      `` or '' or \fX or \% are removed
+
+{
+    need_nl = 0;
+    do_line($0);
+    printf "\n";
+}
+
+function do_line(line) {
+    nxt = index(line, "@[")
+
+    if(nxt == 0) {
+        printf "%s", line;
+        return;
+    }
+
+    if(nxt > 1) {
+        if(substr(line, nxt - 1, 1) == "(") {
+            need_c = 1;
+        }
+        need_nl = 1;
+        printf "%s", substr(line, 1, nxt - 1);
+        do_line(substr(line, nxt));
+        return;
+    }
+
+    tmp = substr(line, 1, 3);
+    if(tmp == "@[.") {
+        macro = "Ix";
+    } else
+    if(tmp == "@[.") {
+        macro = "Id";
+    } else {
+        printf "error: invalid index %s\n", tmp > "/dev/stderr";
+        exit 1;
+    }
+
+    end = match(line, "[^\\\\]]");
+
+    if(end == 0) {
+        printf "error: unfinished @[\n" > "/dev/stderr";
+        exit 1;
+    }
+
+    inx = substr(line, 4, end - 3);
+    gsub("\\\\]", "]", inx);
+    arg = inx;
+    gsub("(\\\\f.|''|``|\\\\%)", "", arg);
+
+    if(arg == "") {
+        printf "error: empty index\n" > "/dev/stderr";
+        exit 1;
+    }
+
+    if(need_c) { printf "\\c"; }
+    if(need_nl) { printf "\n"; }
+
+    printf ".%s ", macro;
+
+    line = substr(line, end + 2);
+
+    if(sub("^=", "", arg)) {
+        printf "\"%s\"", arg;
+        if(line != "") {
+            printf "\n";
+            need_nl = 0;
+            sub("^ ", "", line);
+        }
+    } else if (arg ~ /[|]/) {
+        q = arg; sub("[^|]*[|]", "", q); sub("[|].*", "", arg);
+        printf "\"%s, %s\"\n%s %s", q, arg, arg, q;
+        need_nl = 1;
+    } else {
+        printf "\"%s\"\n%s", arg, inx;
+        need_nl = 1;
+    }
+
+    do_line(line);
+}
+
diff --git a/doc/util/mkindex.c b/doc/util/mkindex.c
deleted file mode 100644
index 9765e6a..0000000
--- a/doc/util/mkindex.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* mkindex
- *
- * Copy named files or standard input (if no arguments are given) to
- * standard output, replacing @[something] by troff macro calls.
- *
- * These replacements are performed:
- *
- * @[.something]   -->  \n.Ix "something"\nsomething
- * @[!something]   -->  \n.Id "something"\nsomething
- *
- * @[.some|thing]  -->  \n.Ix "thing, some"\nsome thing
- * @[!some|thing]  -->  \n.Id "thing, some"\nsome thing
- *
- * @[.=something]  -->  \n.Ix "something"\n
- * @[!=something]  -->  \n.Id "something"\n
- *
- *
- *  1)  initial \n is omitted at the beginning of an output line
- *
- *  2)  initial \n is prefixed by \c if @[ follows "(" in input
- *
- *  3)  omit final \n if @[...] is at end of input line
- *
- *  4)  within @[...], \] is replaced by ]
- *
- *  5)  in the macro argument ("something"), all sequences of the form
- *      `` or '' or \fX or \% are removed
- */
-
-#include <stdio.h>
-
-char *index();
-
-char buf[10000];
-long line;
-char *fn;
-
-main(int ac, char **av) {
-    FILE *fp;
-
-    if (ac < 2) {
-        fn = "stdin";
-        doit(stdin);
-    } else {
-        while (--ac > 0) {
-            fn = *++av;
-            if ((fp = fopen(fn, "r")) == 0) {
-                perror(fn); exit(1);
-            }
-	    /* Traite tous les fichiers un par un */
-            doit(fp);
-            fclose(fp);
-        }
-    }
-    return 0;
-}
-
-doit(FILE *fp) {
-    char *p, *q, *start, *macro;
-    char inx[1000], arg[1000];
-    int n, need_nl = 0;
-
-    line = 1;
-    /* Proceed line by line */
-    while (fgets(buf, 10000, fp) != NULL) {
-        if (p = index(buf, '\n'))
-            *p = 0;
-        p = buf;
-	/* Proceed char by char */
-        while (*p) {
-	    /* On cherche @[ , sinon on affiche le nouveau caractère */
-            if (*p != '@' || p[1] != '[') {
-                putchar(*p);
-                need_nl = 1;
-                p++;
-                start = p;
-            } else {
-                p += 2;
-                switch (*p) {
-		/* @[. -> Ix */
-                case '.':
-                    macro = "Ix"; break;
-		/* @[! -> Ix */
-                case '!':
-                    macro = "Id"; break;
-                case 0:
-                    error("index truncated");
-                default:
-                    error("invalid index type");
-                }
-                p++;
-                q = inx;
-		/* On cherche ] */
-                while (*p != ']') {
-                    if (*p == 0)
-                        error("missing ]");
-		    /* Si ] est escapé, on l'imprime */
-                    if (*p == '\\' && p[1] == ']')
-                        p++;
-                    *q++ = *p++;
-                }
-		/* inx devient ce qu'il y avait entre [ ] */
-                if (q == inx)
-                    error("empty index");
-                *q = 0;
-		/* Vire \f. '' `` \% de l'index et on le met dans arg */
-                eatfont(inx, arg);
-		/* Si le précédent caractère est un "(", on affiche "\\c" */
-                if (start > buf && start[-1] == '(')
-                        printf("\\c");
-		/* Si need_nl == 1, on saute une ligne */
-                if (need_nl)
-                    putchar('\n');
-		/* on affiche .Ix ou .Id */
-                printf(".%s ", macro);
-		/* On bouffe le caractère suivant de l'input */
-                p++;
-		/* Si arg commence par '=', on l'affiche entre "" */
-                if (arg[0] == '=') {
-                    printf("\"%s\"", arg+1);
-		    /* S'il reste du data, on saute une ligne et si c'est
-			une espace, on la saute sans l'afficher ; par
-			ailleurs au prochain coup ça sera pas la peine de
-			sauter une ligne */
-                    if (*p) {
-                        putchar('\n');
-                        need_nl = 0;
-                        if (*p == ' ')
-                            p++;
-                    }
-		/* Si arg est du genre "foo|bar", on affiche
-		    "bar, foo"\nfoo bar */
-                } else if (q = index(arg, '|')) {
-                    *q = 0; q++;
-                    printf("\"%s, %s\"\n%s %s", q, arg, arg, q);
-                    need_nl = 1;
-                } else {
-		/* Sinon on affiche "arg"\ninx */
-                    printf("\"%s\"\n%s", arg, inx);
-                    need_nl = 1;
-                }
-            }
-        }
-	/* Si on a fini de parser, on saute une ligne */
-        putchar('\n');
-        need_nl = 0;
-        line++;
-    }
-}
-
-eatfont(char *from, char *to) {
-    while (*from) {
-	/* "\f." -> "" */
-        if (*from == '\\' && from[1] == 'f' && from[2]) {
-            from += 3;
-	/* "''" -> "" */
-        } else if (*from == '\'' && from[1] == '\'') {
-            from += 2;
-	/* "``" -> "" */
-        } else if (*from == '`' && from[1] == '`') {
-            from += 2;
-	/* "\%" -> "" */
-        } else if (*from == '\\' && from[1] == '%') {
-            from += 2;
-        } else *to++ = *from++;
-    }
-    *to = 0;
-}
-
-error(char *s) {
-    fprintf(stderr, "Error in %s line %d, %s:\n%s\n", fn, line, s, buf);
-    exit(1);
-}