diff --git a/autogen.sh b/autogen.sh
index 1e7d41db..e962111d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,4 +11,11 @@ else
     fi
 fi
 
-autoconf && echo "Finished! Now run configure. If in doubt run ./configure --help"
+ac=`which autoconf 2>/dev/null`
+test -z "$ac" && ac=/usr/local/gnu-autotools/bin/autoconf
+if [ -x "$ac" ]; then
+    "$ac" && echo "Finished! Now run configure. If in doubt run ./configure --help"
+else
+    echo "Please install Gnu autoconf to build from CVS." >&2
+    exit 1
+fi