diff --git a/doc/ChangeLog b/doc/ChangeLog
index 583117a..d13826a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-29 Paul Jakma <paul@dishone.st>
+
+	* defines.texi.in: Add PACKAGE_NAME, PACKAGE_STRING.
+	* quagga.texi: Use PACKAGE_NAME, this is more to give me an excuse
+	  to update quagga.texi so that the 'UPDATED' in version.texi will
+	  be more recent, the Makefile seems to be dumb and not examine
+	  the texi files from which quagga.texi is generated.
+	* quagga.info: Fresh copy to match updates.
+
 2005-04-28 Paul Jakma <paul@dishone.st>
 
 	* quagga.info: updated
diff --git a/doc/defines.texi.in b/doc/defines.texi.in
index 1dd0cb0..a4badef 100644
--- a/doc/defines.texi.in
+++ b/doc/defines.texi.in
@@ -3,6 +3,8 @@
 
 @c Set variables
 @set PACKAGE_NAME @PACKAGE_NAME@
+@set PACKAGE_TARNAME @PACKAGE_TARNAME@
+@set PACKAGE_STRING @PACKAGE_STRING@
 @set AUTHORS Kunihiro Ishiguro, et al.
 @set COPYRIGHT_YEAR 1999-2005
 @set COPYRIGHT_STR Copyright @copyright{} @value{COPYRIGHT_YEAR} @value{AUTHORS}
diff --git a/doc/quagga.info b/doc/quagga.info
index 8acf5dc..2ada2b3 100644
--- a/doc/quagga.info
+++ b/doc/quagga.info
Binary files differ
diff --git a/doc/quagga.texi b/doc/quagga.texi
index 36d72ab..226c9f1 100644
--- a/doc/quagga.texi
+++ b/doc/quagga.texi
@@ -1,7 +1,7 @@
 \input texinfo @c -*- texinfo -*-
 @c %**start of header
 @setchapternewpage odd
-@settitle @uref{http://www.quagga.net,,Quagga}
+@settitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}}
 @setfilename quagga.info
 @defcodeindex op
 @synindex pg cp
@@ -45,7 +45,7 @@
 TCP/IP routing protocols.
 
 This is Edition @value{EDITION}, last updated @value{UPDATED} of
-@cite{The Quagga Manual}, for @uref{http://www.quagga.net/,,Quagga}
+@cite{The Quagga Manual}, for @uref{http://www.quagga.net/,,@value{PACKAGE_NAME}}
 Version @value{VERSION}.
 
 @value{COPYRIGHT_STR}
@@ -56,7 +56,7 @@
 @titlepage
 @title @uref{http://www.quagga.net,,Quagga}
 @subtitle A routing software package for TCP/IP networks
-@subtitle @uref{http://www.quagga.net,,Quagga} version @value{VERSION}
+@subtitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}} @value{VERSION}
 @subtitle @value{UPDATED-MONTH}
 @author @value{AUTHORS}
 
@@ -74,7 +74,7 @@
 		     
 @uref{http://www.quagga.net,,Quagga} is an advanced routing software package
 that provides a suite of TCP/IP based routing protocols.  This is the Manual
-for quagga-@value{VERSION}. @uref{http://www.quagga.net,,Quagga} is a fork of 
+for @value{PACKAGE_STRING}. @uref{http://www.quagga.net,,Quagga} is a fork of 
 @uref{http://www.zebra.org,,GNU Zebra}.
 @end ifnottex