diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c60ce50302..6de2a1fa8b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  1 18:09:58 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* Makefile.in: fix GDB doc targets for new doc subdir structure
+
 Mon Feb  1 17:56:47 1993  John Gilmore  (gnu@cygnus.com)
 
 	* stack.c (parse_frame_specification):  Parse as many arguments
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 9fb34f37b3..e20f9d2e90 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -80,11 +80,6 @@ srcdir = .
 BISON=yacc
 YACC=$(BISON)
 
-# Documentation (gdb.dvi) needs either GNU m4 or SysV m4; 
-# Berkeley/Sun don't have quite enough. 
-#M4=/usr/5bin/m4
-M4=gm4
-
 # where to find texinfo; GDB dist should include a recent one
 TEXIDIR=${srcdir}/../texinfo
 
@@ -653,23 +648,23 @@ force:
 
 # Documentation!
 # GDB QUICK REFERENCE (TeX dvi file, CM fonts)
-refcard.dvi: $(srcdir)/doc/refcard.tex
+refcard.dvi:
 	( cd ./doc; $(MAKE) refcard.dvi $(FLAGS_TO_PASS) )
 	mv ./doc/refcard.dvi .
 
 # GDB QUICK REFERENCE (PostScript output, common PS fonts)
-refcard.ps: $(srcdir)/doc/refcard.tex
+refcard.ps:
 	( cd ./doc; $(MAKE) refcard.ps $(FLAGS_TO_PASS) )
 	mv ./doc/refcard.ps .
 
 # GDB MANUAL: TeX dvi file
 gdb.dvi:
-	( cd ./doc; $(MAKE) M4=$(M4) gdb.dvi $(FLAGS_TO_PASS) )
+	( cd ./doc; $(MAKE) gdb.dvi $(FLAGS_TO_PASS) )
 	mv ./doc/gdb.dvi .
 
 # GDB MANUAL: info file
 gdb.info:
-	( cd ./doc; $(MAKE) M4=$(M4) gdb.info $(FLAGS_TO_PASS) )
+	( cd ./doc; $(MAKE) gdb.info $(FLAGS_TO_PASS) )
 	mv ./doc/gdb.info* .
 
 # Make copying.c from COPYING