diff --git a/ChangeLog b/ChangeLog
index 161f0641377..1a65ad89d0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@ Tue Dec 10 00:04:35 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
 	* configure.in: add decstation host makefile frag.
 
 	* Makefile.in: BISON now bison -y again.  also install-gcc on
-	  install.  clean-gdbm on clean.
+	  install.  clean-gdbm on clean.  infodir belongs in datadir.
 
 Mon Dec  9 16:48:33 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
 
diff --git a/Makefile.in b/Makefile.in
index 4c4d8c67ff3..66183c7c672 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,7 +34,7 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
-infodir = $(prefix)/info
+infodir = $(datadir)/info
 includedir = $(prefix)/include
 docdir = $(datadir)/doc
 
@@ -1430,14 +1430,9 @@ install-info-dirs: force
 		if [ -d $$i ] ; then true ; else mkdir $$i ; fi ; \
 	done
 
-install-dir.info-in-place: force
-	rdir=`cd $(srcdir)/texinfo ; pwd` \
-	&& cd $(infodir) \
-	&& ($${rdir}/gen-info-dir `pwd`) > dir
-
 dir.info: force
-#	$(srcdir)/texinfo/gen-info-dir . > dir.info.new
-#	mv -f dir.info.new dir.info
+	$(srcdir)/texinfo/gen-info-dir $(infodir) > dir.info.new
+	mv -f dir.info.new dir.info
 
 etags tags: TAGS
 
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 6c07eaefbfa..d13f2c061f2 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 10 04:07:21 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: infodir belongs in datadir.
+
 Fri Dec  6 23:57:34 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
 
 	* Makefile.in: remove spaces following hyphens, bsd make can't
diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index abc1a04cdf1..1023a424158 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -34,7 +34,7 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
-infodir = $(prefix)/info
+infodir = $(datadir)/info
 includedir = $(prefix)/include
 docdir = $(datadir)/doc
 
diff --git a/readline/ChangeLog b/readline/ChangeLog
index 7a4cd33e20c..615e3ae5f62 100644
--- a/readline/ChangeLog
+++ b/readline/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 10 04:07:20 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: infodir belongs in datadir.
+
 Fri Dec  6 23:23:14 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
 
 	* Makefile.in: remove spaces following hyphens, bsd make can't