diff --git a/autogen.sh b/autogen.sh
index 2f5a1f030..75bede514 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-echo "Generating build information using aclocal and autoconf"
+echo "Generating build information using autoconf"
 echo "This may take a while ..."
 
 # Regenerate configuration files
-(aclocal && autoconf) || exit $?
-(cd test; aclocal; autoconf)
+cp acinclude.m4 aclocal.m4
+autoconf
+# FIXME
+#(cd test; aclocal; autoconf)
 
 # Run configure for this platform
 echo "Now you are ready to run ./configure"