diff --git a/Makefile.am b/Makefile.am
index e8929a59..e33881fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -279,7 +279,7 @@ cachegrind:
 		tail cachegrind.log
 
 # Rules for documentation
-
+if HAVE_ADVD2
 snapraid.1 : snapraid.d
 	advd2 man < $(srcdir)/$< > $@
 
@@ -291,6 +291,7 @@ snapraid.html : snapraid.d
 
 snapraid.hh : snapraid.d
 	advd2 frame < $(srcdir)/$< > $@
+endif
 
 # Windows distribution
 
diff --git a/autogen.sh b/autogen.sh
index 6cbb0260..25bc6c79 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,20 +1,9 @@
 #!/bin/sh
 #
-echo "Generating build information using aclocal, automake and autoconf"
-echo "This may take a while ..."
+echo "Generating build information using autoreconf"
 
-# Touch the timestamps on all the files since CVS messes them up
-touch configure.ac
-
-# Touch documentation to avoid it's recreation
-touch snapraid.1
-touch snapraid.txt
-
-# Regenerate configuration files
-aclocal
-automake --add-missing --force-missing
-autoconf
-autoheader && touch config.h
+# All is done by autoreconf
+autoreconf
 
 # Run configure for this platform
 echo "Now you are ready to run ./configure"
diff --git a/configure.ac b/configure.ac
index a3eec4b9..7bac5ab7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,8 @@ AC_PROG_CC
 AC_USE_SYSTEM_EXTENSIONS
 AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind --leak-check=full --track-fds=yes --error-exitcode=1],[])
 AC_CHECK_PROG([WINE],[wine],[wine],[])
+AC_CHECK_PROG([ADVD2],[advd2],[advd2],[])
+AM_CONDITIONAL(HAVE_ADVD2, [test x"$ADVD2" != x])
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE