diff --git a/.cvsignore b/.cvsignore
index 406feea..56bb857 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,6 +5,7 @@ aclocal.m4
 autom4te.cache
 config.*
 configure
+depcomp
 install-sh
 missing
 mkinstalldirs
diff --git a/autogen.sh b/autogen.sh
index 9385192..f32f91a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,10 +14,10 @@ DIE=0
 
 echo "Generating build files, please wait...."
 
-AUTOHEADER_CHOICES="$AUTOHEADER autoheader213 autoheader-2.13 autoheader"
-ACLOCAL_CHOICES="$ACLOCAL aclocal14 aclocal-1.4 aclocal"
-AUTOMAKE_CHOICES="$AUTOMAKE automake14 automake-1.4 automake"
-AUTOCONF_CHOICES="$AUTOCONF autoconf213 autoconf-2.13 autoconf"
+AUTOHEADER_CHOICES="$AUTOHEADER autoheader"
+ACLOCAL_CHOICES="$ACLOCAL aclocal"
+AUTOMAKE_CHOICES="$AUTOMAKE automake"
+AUTOCONF_CHOICES="$AUTOCONF autoconf"
 
 for i in $AUTOHEADER_CHOICES ; do
     $i --version </dev/null >/dev/null 2>&1 && AUTOHEADER=$i && break
@@ -42,16 +42,13 @@ done
 # Export them so configure can AC_SUBST() them.
 export AUTOHEADER ACLOCAL AUTOMAKE AUTOCONF
 
-# Check for existing libast.m4 we can use.  Use the local one if not.
-if test ! -f "`$ACLOCAL --print-ac-dir`/libast.m4"; then
-    ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
-fi
+rm -rf aclocal.m4 autom4te.cache
 
 # Run the stuff.
-(set -x && $AUTOHEADER)
 (set -x && $ACLOCAL $ACLOCAL_FLAGS)
-(set -x && $AUTOMAKE -a -c)
 (set -x && $AUTOCONF)
+(set -x && $AUTOHEADER)
+(set -x && $AUTOMAKE -a -c)
 
 # Run configure.
 ./configure "$@"
diff --git a/configure.in b/configure.in
index af06a34..df7a238 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(ipc.c)
-AM_INIT_AUTOMAKE(e16keyedit, 0.1.0)
+AM_INIT_AUTOMAKE(e16keyedit, 0.1.99.1)
+
+AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -10,7 +12,7 @@ AC_PROG_MAKE_SET
 
 dnl Checks for libraries.
 AC_ARG_ENABLE(gtk2,
-        [  --enable-gtk2=[no/yes]        enables the gtk2 GUI (default=yes)],,
+        [  --enable-gtk2=[no/yes]        enables the gtk2 GUI (default=no)],,
                  enable_gtk2=no)
                 
 if [ ! test "x$enable_gtk2" != "xyes"]; then
@@ -28,6 +30,8 @@ else
   fi
 fi
 
+AC_SUBST(ENABLE_GTK2)
+
 dnl Checks for header files.
 AC_PATH_X
 AC_HEADER_STDC
diff --git a/e16keyedit.spec b/e16keyedit.spec
index d466759..f41971f 100644
--- a/e16keyedit.spec
+++ b/e16keyedit.spec
@@ -1,6 +1,6 @@
 Summary: GUI Tool for Editing Enlightenment 0.16.x Keybindings
 Name: e16keyedit
-Version: 0.1.0
+Version: 0.1.99.1
 Release: 1%{?_vendorsuffix:.%{_vendorsuffix}}
 Copyright: BSD-like
 Group: User Interface/Desktops
diff --git a/ipc.c b/ipc.c
index d8a311c..1ecd249 100644
--- a/ipc.c
+++ b/ipc.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
@@ -218,7 +220,7 @@ CommsSetup(void)
 				-100, -100, 5, 5, 0, 0, 0);
 }
 
-static Window
+static              Window
 CommsFindCommsWindow(void)
 {
    unsigned char      *s;
diff --git a/menus.c b/menus.c
index a49df4d..50e5f69 100644
--- a/menus.c
+++ b/menus.c
@@ -1,11 +1,9 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <string.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/viewer.c b/viewer.c
index 4398eac..dc9e1cb 100644
--- a/viewer.c
+++ b/viewer.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <gtk/gtk.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -1098,7 +1100,7 @@ main(int argc, char *argv[])
      }
 
    CommsSend("set clientname Enlightenment Keybinding Configuration Utility");
-   CommsSend("set version 0.1.0");
+   CommsSend("set version " VERSION);
 #if 0
    CommsSend("set author Mandrake (Geoff Harrison)");
    CommsSend("set email mandrake@mandrake.net");