diff --git a/ChangeLog b/ChangeLog
index 3bb774c..839e94c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-19 Hasso Tepper <hasso at quagga.net>
+
+	* configure.ac: Avoid regeneration of doc/quagga.info for now.
+
 2004-11-17 Paul Jakma <paul@dishone.st>
 
 	* INSTALL.quagga.txt: texinfo version corrected, so section on
diff --git a/configure.ac b/configure.ac
index 1a72fa1..18be8ac 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.76 2004/11/12 09:27:04 paul Exp $
+## $Id: configure.ac,v 1.77 2004/11/19 06:41:49 hasso Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(Quagga, 0.97.3, [http://bugzilla.quagga.net])
@@ -1155,6 +1155,9 @@
 	  pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh
 	  pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh])
 AC_CONFIG_FILES([vtysh/extract.pl],[chmod +x vtysh/extract.pl])
+## Hack, but working solution to avoid rebuilding of quagga.info.
+## It's already in CVS until texinfo 4.7 is more common.
+AC_CONFIG_COMMANDS([info-time],[touch doc/quagga.info])
 AC_OUTPUT
 
 echo "
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9aa487f..409f506 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-19 Hasso Tepper <hasso at quagga.net>
+
+	* Makefile.am: Don't remove quagga.info while cleaning up.
+
 2004-11-15 Paul Jakma <paul@dishone.st>
 
 	* routeserver.texi: Strip ctrl-M from line endings, note by
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a6e5ea9..a8d4bfd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -15,7 +15,7 @@
 
 info_TEXINFOS = quagga.texi
 
-CLEANFILES = *.pdf quagga.info
+CLEANFILES = *.pdf
 
 # The figure sources
 figures_SOURCES = fig-normal-processing.eps \