diff --git a/Makefile.am b/Makefile.am
index 411caa98c2b23d4d471c164d44512e531ba76663..e3e8781921d786588c8947d84e0d3bc86f2ac2f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,6 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
 ACLOCAL_AMFLAGS = -I autotools
-DOCBOOK_WRAPPER = $(top_srcdir)/autotools/docbook-wrapper
 BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion
 RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
 CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
@@ -336,7 +335,6 @@ EXTRA_DIST = \
 	autotools/check-python-code \
 	autotools/check-man \
 	autotools/check-tar \
-	autotools/docbook-wrapper \
 	autotools/gen-coverage \
 	autotools/testrunner \
 	$(RUN_IN_TEMPDIR) \
diff --git a/autotools/docbook-wrapper b/autotools/docbook-wrapper
deleted file mode 100755
index 681d9c1d19d6143f8dc56dd2eaeb69687b3b8c5c..0000000000000000000000000000000000000000
--- a/autotools/docbook-wrapper
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if test "$#" != 4
-then
-  echo "Wrong number of arguments." >&2
-  exit 1
-fi
-
-cmd="${1}"
-input="${2}"
-cmdoutputfile="${3}"
-output="${4}"
-
-# docbook2man inserts a date formatted using the current locale into its
-# output. Using the "C" locale makes sure it's always in the default format.
-export LC_ALL=C
-
-tmpdir=`mktemp -d`
-trap "rm -rf ${tmpdir}" EXIT
-
-if ! ( cd `dirname ${input}` &&
-       ${cmd} -o ${tmpdir} `basename "${input}"` >/dev/null; )
-then
-  echo "Building ${output} failed." >&2
-  exit 1
-fi
-
-mv "${tmpdir}/${cmdoutputfile}" "${output}"
-
-# Needed for make to recognize output file
-touch "${output}"
diff --git a/configure.ac b/configure.ac
index 6b0ee00b68f3f879036b8641aea20589b8b638eb..afae4b4254239424700b4eda3ba6ede2d0564736 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,21 +227,7 @@ AC_SUBST(SYSLOG_USAGE, $SYSLOG)
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
-# Check for docbook programs
-AC_ARG_VAR(DOCBOOK2MAN, [docbook2man path])
-AC_PATH_PROG(DOCBOOK2MAN, [docbook2man], [])
-if test -z "$DOCBOOK2MAN"
-then
-  AC_MSG_WARN([docbook2man not found, man pages rebuild will not be possible])
-fi
-
-AC_ARG_VAR(DOCBOOK2HTML, [docbook2html path])
-AC_PATH_PROG(DOCBOOK2HTML, [docbook2html], [])
-if test -z "$DOCBOOK2HTML"
-then
-  AC_MSG_WARN([docbook2html not found, man pages rebuild will not be possible])
-fi
-
+# Check for pandoc
 AC_ARG_VAR(PANDOC, [pandoc path])
 AC_PATH_PROG(PANDOC, [pandoc], [])
 if test -z "$PANDOC"
diff --git a/doc/devnotes.rst b/doc/devnotes.rst
index 898d03a221f70188ba627ebd90b8a15c45013dba..8b58ed7d2e5a3d668419a8fa824f360cd7a907fc 100644
--- a/doc/devnotes.rst
+++ b/doc/devnotes.rst
@@ -9,8 +9,7 @@ Most dependencies from :doc:`install-quick`, plus:
 - `GNU make <http://www.gnu.org/software/make/>`_
 - `GNU tar <http://www.gnu.org/software/tar/>`_
 - `Gzip <http://www.gnu.org/software/gzip/>`_
-- `Docbook tools <http://sources.redhat.com/docbook-tools/>`_
-  (docbook2html and docbook2man)
+- `pandoc <http://johnmacfarlane.net/pandoc/>`_
 - `python-sphinx <http://sphinx.pocoo.org/>`_
   (tested with version 0.6.1)
 - `graphviz <http://www.graphviz.org/>`_