diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4935ea7684e4842b02a62c6b3c2f620fb1b6f22b..c041b72bc28007412a08e91994f7fdff53966e38 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.23 2001/04/30 19:20:17 ceder Exp $
+# $Id: Makefile.am,v 1.24 2001/04/30 21:48:08 ceder Exp $
 # Copyright (C) 1998-1999  Lysator Academic Computer Association.
 #
 # This file is part of the LysKOM server.
@@ -95,7 +95,7 @@ check-doc: Protocol-A.notab lyskomd.notab info
 	< $(top_srcdir)/src/server/fncdef.txt \
 	| awk '{print $$1, $$3}' \
 	| sed 's/_/-/g' \
-	| tee numbered-requests.tmp \
+	| tee requests-numbered.tmp \
 	| awk '{print $$2}' \
 	| tee requests.tmp \
 	| sed 's/.*/^@req{&}$$/' \
@@ -106,10 +106,13 @@ check-doc: Protocol-A.notab lyskomd.notab info
 	< requests.tmp >> requests-@.tmp
 
 	# Create a list of all async messages.
-	sed -n -e '/#if 0/,/#endif/d' \
-	       -e 's/[ 	]*ay_\([^ ]*\) =.*/async_\1/p' \
+	sed -n -e '/^#if 0/,/^#endif/d' \
+	       -e '/^#ifdef/,/^#endif/d' \
+	       -e 's/[ 	]*ay_\([^ ]*\) = \([0-9]*\).*/\2 async_\1/p' \
 	       $(top_srcdir)/src/server/async.h \
 	| sed 's/_/-/g' \
+	| tee asyncs-numbered.tmp \
+	| awk '{print $$2}' \
 	| tee asyncs.tmp \
 	| sed 's/.*/^@async{&}$$/' \
 	> async-@.tmp