diff --git a/configure.in b/configure.in
index 7deaa6e27..cd5774656 100644
--- a/configure.in
+++ b/configure.in
@@ -99,23 +99,9 @@ AC_SUBST(CONFIG_POD2HTML)
 AC_SUBST(CONFIG_XMLTO)
 AC_SUBST(CONFIG_JW)
 
-EL_CONFIG_DEPENDS(CONFIG_DOC, [CONFIG_ASCIIDOC CONFIG_XMLTO CONFIG_JW CONFIG_POD2HTML], [Documentation])
-
-if test "$CONFIG_ASCIIDOC" = yes &&
-   test "$CONFIG_XMLTO" = yes &&
-   test "$CONFIG_JW" = yes; then
-	EL_CONFIG_DEPENDS(CONFIG_MANUAL, [MANUAL_ASCIIDOC MANUAL_XMLTO MANUAL_JW], [Manual Formats])
-fi
-
-if test "$CONFIG_ASCIIDOC" = yes &&
-   test "$CONFIG_XMLTO" = yes; then
-	EL_CONFIG_DEPENDS(CONFIG_MANUAL, [MAN_ASCIIDOC MAN_XMLTO], [Man Page Formats])
-fi
-
-AC_SUBST(CONFIG_ASCIIDOC)
-AC_SUBST(CONFIG_POD2HTML)
-AC_SUBST(CONFIG_XMLTO)
-AC_SUBST(CONFIG_JW)
+EL_CONFIG_DEPENDS(CONFIG_DOC, [CONFIG_ASCIIDOC CONFIG_XMLTO CONFIG_JW CONFIG_POD2HTML], [Documentation Tools])
+EL_CONFIG_DEPENDS(CONFIG_MANUAL, [MANUAL_ASCIIDOC MANUAL_XMLTO MANUAL_JW], [Manual Formats])
+EL_CONFIG_DEPENDS(CONFIG_MANPAGE, [MAN_ASCIIDOC MAN_XMLTO], [Man Page Formats])
 
 dnl gcc specific options (to be continued at the bottom of configure)
 if test "x$ac_cv_prog_gcc" = "xyes"; then