diff --git a/doc/ChangeLog b/doc/ChangeLog
index bb79cc8..6711610 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,11 @@
 2004-11-07 Paul Jakma <paul@dishone.st>
 
+	* Makefile.am: Add routeserver.texi to quagga_TEXINFOS.
+	  Add quagga.info to clean files list (would have thought automake
+          would have done this, but it doesnt seem to)
+
+2004-11-07 Paul Jakma <paul@dishone.st>
+
 	* quagga.texi: include routeserver.texi. TODO: integrate the current
           multiple-instance orientated bgpd route-server section with the
           new route-server docs.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bcf55e2..a6e5ea9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -15,7 +15,7 @@
 
 info_TEXINFOS = quagga.texi
 
-CLEANFILES = *.pdf
+CLEANFILES = *.pdf quagga.info
 
 # The figure sources
 figures_SOURCES = fig-normal-processing.eps \
@@ -31,8 +31,8 @@
 
 quagga_TEXINFOS = appendix.texi basic.texi bgpd.texi filter.texi install.texi \
 	ipv6.texi kernel.texi main.texi ospf6d.texi ospfd.texi overview.texi \
-	protocol.texi ripd.texi ripngd.texi routemap.texi snmp.texi vtysh.texi \
-	defines.texi $(figures_SOURCES)
+	protocol.texi ripd.texi ripngd.texi routemap.texi snmp.texi \
+	vtysh.texi routeserver.texi defines.texi $(figures_SOURCES)
 
 %.pdf: %.eps
 	$(EPSTOPDF) --outfile="$@" $<