diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2e607fac..eba8aa16 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+1999-09-29  Martin Baulig  <martin@home-of-linux.org>
+
+	* Makefile.am: Reverted Timur's commit.
+	(MAKEINFO): Add `-I @libgtop_top_builddir@/doc' here. This still
+	creates libgtop.info in srcdir, but that's an automake problem.
+
 Tue Jun 15 15:59:50 1999 Timur Bakeyev <mc@bat.ru>
 
 	* Makefile.am: Force `auto-macros.texi' to be created in $(srcdir),
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2e3b1e0b..4fedf0c6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,9 @@ info_TEXINFOS		= libgtop.texi
 
 libgtop_TEXINFOS	= libgtop.texi about.texi reference.texi \
 			  auto-macros.texi version.texi main.texi \
-			  white-paper.texi internals.texi
+			  white-paper.texi
+
+MAKEINFO		+= -I @libgtop_top_builddir@/doc
 
 EXTRA_DIST		= auto-macros.texi.in
 
@@ -33,11 +35,11 @@ auto-macros.texi: auto-macros.texi.in Makefile
 	  -e 's#\%libgtop_use_machine_h\%#$(libgtop_use_machine_h)#g' \
 	  -e 's#\%libgtop_guile_found\%#$(libgtop_guile_found)#g' \
 	  -e 's#\%libgtop_want_examples\%#$(libgtop_want_examples)#g' \
-	      < $(srcdir)/auto-macros.texi.in > $(srcdir)/auto-macros.tmp
-	echo '@c Set this if this is LibGTop 1.1.x' >> $(srcdir)/auto-macros.tmp
+	      < $(srcdir)/auto-macros.texi.in > auto-macros.tmp
+	echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp
 	if [ $(LIBGTOP_VERSION_CODE) -ge 1001000 ] ; then \
-	  echo '@set LIBGTOP-1-1' >> $(srcdir)/auto-macros.tmp ; \
+	  echo '@set LIBGTOP-1-1' >> auto-macros.tmp ; \
 	else \
-	  echo '@clear LIBGTOP-1-1' >> $(srcdir)/auto-macros.tmp ; \
+	  echo '@clear LIBGTOP-1-1' >> auto-macros.tmp ; \
 	fi
-	mv $(srcdir)/auto-macros.tmp $(srcdir)/auto-macros.texi
+	mv auto-macros.tmp auto-macros.texi