diff --git a/configure.ac b/configure.ac
index fe8e311faf..23f7b0a123 100755
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,9 @@
 ##
 AC_PREREQ(2.53)
 
-AC_INIT(lib/zebra.h)
-AM_INIT_AUTOMAKE(quagga, 0.96.2)
+AC_INIT(quagga, 0.96.2, [bug-zebra@gnu.org])
+AC_CONFIG_SRCDIR(lib/zebra.h)
+AM_INIT_AUTOMAKE()
 AM_CONFIG_HEADER(config.h)
 
 dnl -----------------------------------
@@ -935,13 +936,6 @@ if test x"${ac_cv_header_execinfo_h}" = x"yes"; then
   )
 fi
 
-dnl -------------
-dnl check version
-dnl -------------
-file="${srcdir}/lib/version.h"
-VERSION=`sed -ne 's/^#.*QUAGGA_VERSION.*\"\([^\"]*\)\"$/\1/p' $file`
-AC_SUBST(VERSION)
-
 dnl ----------
 dnl configure date
 dnl ----------
@@ -1015,12 +1009,13 @@ AC_OUTPUT(Makefile lib/Makefile zebra/Makefile ripd/Makefile
 	  ripngd/Makefile bgpd/Makefile ospfd/Makefile 
 	  ospf6d/Makefile vtysh/Makefile doc/Makefile 
 	  ospfclient/Makefile
-	  redhat/quagga.spec)
+	  redhat/quagga.spec
+	  lib/version.h)
 
 echo "
 zebra configuration
 -------------------
-quagga version           : ${VERSION}
+quagga version           : ${PACKAGE_VERSION}
 host operationg system  : ${host_os}
 source code location    : ${srcdir}
 compiler                : ${CC}
diff --git a/doc/.cvsignore b/doc/.cvsignore
index 52e888adea..a12ecd858f 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -5,3 +5,4 @@ zebra.info-*
 zebra.html
 quagga.info*
 quagga.html
+quagga.pdf
diff --git a/lib/.cvsignore b/lib/.cvsignore
index b8e258be48..d95f62f785 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -2,4 +2,5 @@ Makefile
 Makefile.in
 *.o
 version.c
+version.h
 .deps
diff --git a/lib/version.h b/lib/version.h.in
similarity index 85%
rename from lib/version.h
rename to lib/version.h.in
index 9280613d0b..8b8b9f6e9f 100644
--- a/lib/version.h
+++ b/lib/version.h.in
@@ -22,13 +22,13 @@
 #ifndef _ZEBRA_VERSION_H
 #define _ZEBRA_VERSION_H
 
-#define QUAGGA_PROGNAME   "quagga"
+#define QUAGGA_PROGNAME   "@PACKAGE_NAME@"
 
-#define QUAGGA_VERSION     "0.96.2"
+#define QUAGGA_VERSION     "@PACKAGE_VERSION@"
 
-#define ZEBRA_BUG_ADDRESS "bug-zebra@gnu.org"
+#define ZEBRA_BUG_ADDRESS "@PACKAGE_BUGREPORT@"
 
-#define ZEBRA_URL "http://www.quagga.net"
+#define QUAGGA_URL "http://www.quagga.net"
 
 extern char *host_name;