diff --git a/configure.ac b/configure.ac
index ce8aba9..7d9aa3f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1635,7 +1635,6 @@
 	  fpm/Makefile
 	  redhat/quagga.spec 
 	  lib/version.h
-	  doc/defines.texi
 	  isisd/topology/Makefile
 	  pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh
 	  pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh])
diff --git a/doc/.gitignore b/doc/.gitignore
index ed527fc..459531b 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -4,7 +4,6 @@
 draft-zebra-00.txt
 quagga.info-*
 zebra.html
-defines.texi
 version.texi
 quagga.html
 quagga.info
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c7b2891..e20940d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -34,9 +34,6 @@
 # provided by automake. If you are an automake wizard, please feel free to
 # compact it somehow.
 
-# Built from defines.texi.in
-BUILT_SOURCES = defines.texi
-
 info_TEXINFOS = quagga.texi
 
 # Have to manually specify the quagga.pdf rule in order to allow
diff --git a/doc/defines.texi.in b/doc/defines.texi
similarity index 72%
rename from doc/defines.texi.in
rename to doc/defines.texi
index a4badef..b7b529e 100644
--- a/doc/defines.texi.in
+++ b/doc/defines.texi
@@ -1,10 +1,9 @@
 @c -*- texinfo -*-
-@c @configure_input@
 
 @c Set variables
-@set PACKAGE_NAME @PACKAGE_NAME@
-@set PACKAGE_TARNAME @PACKAGE_TARNAME@
-@set PACKAGE_STRING @PACKAGE_STRING@
+@set PACKAGE_NAME Quagga
+@set PACKAGE_TARNAME quagga
+@set PACKAGE_STRING Quagga 1.2.0
 @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.texi b/doc/quagga.texi
index bcf23de..3e21cf8 100644
--- a/doc/quagga.texi
+++ b/doc/quagga.texi
@@ -70,7 +70,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 @value{PACKAGE_STRING}. @uref{http://www.quagga.net,,Quagga} is a fork of 
+for Quagga @value{VERSION}. @uref{http://www.quagga.net,,Quagga} is a fork of 
 @uref{http://www.zebra.org,,GNU Zebra}.
 
 @insertcopying