diff --git a/Makefile.am b/Makefile.am
index feaaaa9d7..e9069d36d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS = src doc module testsuite
+SUBDIRS = src doc testsuite
+
+# FIXME: The `module' directory is removed from `SUBDIRS' until it can
+# actually be built.
 
 EXTRA_DIST = acconfig.h
 
diff --git a/autogen.sh b/autogen.sh
index 7aa465ef2..5bc8c7835 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,6 +11,7 @@ else
   fi
 fi
 
-autoheader
-automake -a
+libtoolize &&  \
+autoheader &&  \
+automake -a && \
 autoconf