diff --git a/configure.ac b/configure.ac
index 6cfcf5d7d2c25ee3f5d1dc2e4914c5fdfebe769d..189351551c2437d8c37063683c72f23a272c1b46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,23 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
+# Configure script for Ganeti
 
 AC_PREREQ(2.59)
 AC_INIT(ganeti, 1.2a, ganeti@googlegroups.com)
 AC_CONFIG_AUX_DIR(autotools)
 AM_INIT_AUTOMAKE(foreign)
 
-# Checks for programs.
+# Check common programs
 AC_PROG_INSTALL
 
-# Checks for python
+# Check for Python
 AM_PATH_PYTHON(2.4)
 
-# Checks for libraries.
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-
-# Checks for library functions.
+# Check for docbook2man
+found_docbook2man=
+AC_CHECK_PROG(found_docbook2man, [docbook2man], [yes])
+if test "$found_docbook2man" != "yes"
+then
+  AC_MSG_WARN([docbook2man not found.])
+fi
 
 AC_CONFIG_FILES([Makefile man/Makefile docs/Makefile 
   testing/Makefile tools/Makefile