diff --git a/autogen.sh b/autogen.sh
index 1b452ff6a..4ba72fa81 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,9 @@ echo "This may take a while ..."
 
 # Regenerate configuration files
 cp acinclude.m4 aclocal.m4
-autoconf
+for autoconf in autoconf autoconf259
+do if which $autoconf >/dev/null; then $autoconf; break; fi
+done
 (cd test; sh autogen.sh)
 
 # Run configure for this platform
diff --git a/test/autogen.sh b/test/autogen.sh
index 1103dbd51..09ecb2abe 100755
--- a/test/autogen.sh
+++ b/test/autogen.sh
@@ -2,4 +2,6 @@
 #
 # Regenerate configuration files
 cp acinclude.m4 aclocal.m4
-autoconf
+for autoconf in autoconf autoconf259
+do if which $autoconf >/dev/null; then $autoconf; break; fi
+done