diff --git a/ChangeLog b/ChangeLog
index b0cc374df17354d947d6d9cde5eb29436beeb058..6738b1f14d027f646c5d1277871be6ca0fe642a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-17  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	* doc/Makefile.am:
+	  Work also with docbook2man as installed on Fedora
+
 2005-06-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* autogen.sh:
diff --git a/configure.ac b/configure.ac
index 793c9cddb51ecbfd1618acfbf8b07ecf90fa2e0a..18d259afd8f82b7da3b31c5ab63b236908ab196f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,8 +49,8 @@ if test $HAVE_DOXYGEN = "false"; then
 fi
 
 # Check for docbook
-AC_CHECK_PROG(HAVE_DOCBOOKTOMAN, docbook-to-man, true, false)
-AM_CONDITIONAL(HAVE_DOCBOOKTOMAN,$HAVE_DOCBOOKTOMAN)
+AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, false)
+AM_CONDITIONAL(HAVE_DOCBOOKTOMAN, test "x$DOCBOOKTOMAN" != "xfalse")
 AC_CHECK_PROG(HAVE_DOCBOOK2HTML, docbook2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK2HTML,$HAVE_DOCBOOK2HTML)
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 106d82f932f4dfcc0a49b11ce85150fa89e9b468..0073c4834182c6ee4d31131e85cc7fd290e2e65f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,7 +25,7 @@ html: oggzdiff.1.html oggzdump.1.html oggzinfo.1.html oggzmerge.1.html \
 
 if HAVE_DOCBOOKTOMAN
 %.1: %.1.sgml
-	docbook-to-man $< > $@
+	$(DOCBOOKTOMAN) $< > $@
 else
 %.1: %.1.sgml
 endif