diff --git a/gas/doc/Makefile b/gas/doc/Makefile
index c928fffd982..521f47340be 100755
--- a/gas/doc/Makefile
+++ b/gas/doc/Makefile
@@ -3,11 +3,11 @@
 # see pretex.m4 for discussion of preprocessor definitions
 
 # What version of the manual you want (see *.m4); "all" includes everything
-CONFIG=a29k-coff
+CONFIG=all
 
 # Sun/Berkeley m4 doesn't have all the things we need; use GNU or sV
-#M4=gm4
-M4=/usr/5bin/m4
+M4=gm4
+#M4=/usr/5bin/m4
 
 # Directory for gas source
 srcdir=..
@@ -18,9 +18,9 @@ TEXIDIR = $(srcdir)/../texinfo/fsf
 as.info: as-${CONFIG}.texinfo
 	makeinfo -o as.info as-${CONFIG}.texinfo
 
-# There's no index yet; when there is, add texindex call before tex 2nd pass
 as.dvi:	as-${CONFIG}.texinfo
 	TEXINPUTS=${TEXIDIR}:.:$$TEXINPUTS tex as-${CONFIG}.texinfo
+	texindex as-${CONFIG}.??
 	TEXINPUTS=${TEXIDIR}:.:$$TEXINPUTS tex as-${CONFIG}.texinfo
 	mv as-${CONFIG}.dvi as.dvi
 	rm as-${CONFIG}.?? as-${CONFIG}.???
diff --git a/gas/doc/all.m4 b/gas/doc/all.m4
index 66f1fdd9c3b..dc96dcee095 100644
--- a/gas/doc/all.m4
+++ b/gas/doc/all.m4
@@ -8,7 +8,8 @@ _define__(<_BOUT__>,<1>)
 _define__(<_COFF__>,<1>)
 _define__(<_ELF__>,<1>)
 
-_define__(<_AMD29K__>,<1>)
+_define__(<_A29K__>,<1>)
+_define__(<_H8__>,<1>)
 _define__(<_I80386__>,<1>)
 _define__(<_I960__>,<1>)
 _define__(<_M680X0__>,<1>)