diff --git a/configure b/configure
index 0a62b0fd..b1c51165 100755
--- a/configure
+++ b/configure
@@ -530,6 +530,8 @@ else
   ac_n= ac_c='\c' ac_t=
 fi
 
+source version
+
 CC_LIST="gcc acc cc c89"
 
 mh_sysv_incdir=""
@@ -2465,7 +2467,7 @@ if test "$ac_cv_prog_CC" = "gcc"; then
 	if test "$with_debug" = yes; then
 		CFLAGS="${CFLAGS} -Wall"
 	else
-		CFLAGS="-O2 -Wall -fomit-frame-pointer"
+		CFLAGS="-O3 -Wall -fomit-frame-pointer"
 	fi
 fi
 if test "$on_qnx" = yes; then
@@ -3010,6 +3012,8 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@VER@%$VER%g
+s%@VERDOT@%$VERDOT%g
 s%@CC@%$CC%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
diff --git a/configure.in b/configure.in
index f0762d3c..da12be9d 100755
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(curspriv.h)
 AC_PREFIX_DEFAULT(/usr)
+
+source version
+
+AC_SUBST(VER)
+AC_SUBST(VERDOT)
 AC_SUBST(prefix)
 
 dnl ---------------------- check for C compiler -----------------
diff --git a/xcurses-config.in b/xcurses-config.in
index 189ec5b8..e42a40c2 100755
--- a/xcurses-config.in
+++ b/xcurses-config.in
@@ -3,14 +3,12 @@
 # The idea to this kind of setup info script was stolen from numerous
 # other packages, such as neon, libxml and gnome.
 #
-# $Id: xcurses-config.in,v 1.3 2006/02/10 19:18:54 wmcbrine Exp $
+# $Id: xcurses-config.in,v 1.4 2006/02/14 02:53:07 wmcbrine Exp $
 #
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
 
-source version
-
 usage()
 {
     echo "Usage: xcurses-config [OPTION]"
@@ -25,7 +23,7 @@ usage()
     echo "  --prefix       PDCurses install prefix"
     echo "                 [$prefix]"
     echo "  --version      output version information"
-    echo "                 [$VERDOT]"
+    echo "                 [@VERDOT@]"
     exit $1
 }
 
@@ -48,7 +46,7 @@ while test $# -gt 0; do
        ;;
 
     --version)
-       echo @VER_DOT@
+       echo @VERDOT@
        exit 0
        ;;