diff --git a/autogen.sh b/autogen.sh
index 5afad78c2..332a9cc5d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,16 @@
 #! /bin/sh
-# Bootstrap the development environment
+
+# Bootstrap the development environment - add extra files needed to run configure. 
+# Note autoreconf should do what this file achieves, but it has a bug when working with automake!
+# The latest config.guess and config.sub should be copied into Tools/config and checked into CVS
+# when upgrading the autotools. Otherwise this script will ensure the latest is copied from 
+# your autotool installation.
 
 set -x
+test -d Tools/config || mkdir Tools/config
+aclocal -I Tools/config
 autoheader
+automake --add-missing --copy --force-missing
 autoconf
 (cd Tools; autoconf)
+