diff --git a/contrib/teamcity/build-configurations.yml b/contrib/teamcity/build-configurations.yml
index fc06cf749..79e6c63b7 100644
--- a/contrib/teamcity/build-configurations.yml
+++ b/contrib/teamcity/build-configurations.yml
@@ -1,418 +1,419 @@
 ---
 # Templates can be referenced in builds to avoid duplication
 templates:
   gitian_builds:
     script: contrib/teamcity/gitian.sh
     timeout: 7200
     artifacts:
       gitian-results: ''
 
   check+secp256k1:
     targets:
       - - all
         - install
         - install-secp256k1
       - - check
         - check-secp256k1
         - check-functional
 
   secp256k1:
     Werror: true
     targets:
       - - secp256k1
         - install-secp256k1
       - - check-secp256k1
 
 # The build descriptions.
 # If a script is defined, then this will be the only step to run.
 # Otherwise a list of targets can be specified, grouped by parallel runs.
 # Example:
 #   targets:
 #     - - build11
 #       - build12
 #     - - build21
 #       - build22
 # Will run:
 #   ninja build11 build12
 #   ninja build21 build22
 builds:
   build-asan:
     Werror: true
     clang: true
     cmake_flags:
       - '-DCMAKE_CXX_FLAGS=-DARENA_DEBUG'
       - '-DCMAKE_BUILD_TYPE=Debug'
       - '-DCRYPTO_USE_ASM=OFF'
       - '-DENABLE_SANITIZERS=address'
     templates:
       - check+secp256k1
     timeout: 1800
     env:
       ASAN_OPTIONS: log_path=stdout
       LSAN_OPTIONS: log_path=stdout
 
   build-bench:
     Werror: true
     cmake_flags:
       - '-DSECP256K1_ENABLE_MODULE_ECDH=ON'
       - '-DSECP256K1_ENABLE_MODULE_MULTISET=ON'
     targets:
       - - all
         - install-bitcoin-bench
         - install-secp256k1-bench
       - - bench-bitcoin
       - - bench-secp256k1
     timeout: 1200
 
   build-clang:
     runOnDiff: true
     Werror: true
     clang: true
     targets:
       - - all
         - install
         - install-secp256k1
       - - check
         - check-secp256k1
     timeout: 1200
 
   build-clang-tidy:
     runOnDiff: true
     clang: true
     cmake_flags:
       - '-DENABLE_CLANG_TIDY=ON'
     targets:
       - - all
       - - check
     timeout: 1800
 
   build-coverage:
     gcc: true
     cmake_flags:
       - '-DENABLE_COVERAGE=ON'
       - '-DENABLE_BRANCH_COVERAGE=ON'
     targets:
       - - coverage-check-extended
     post_build: |
       "${TOPLEVEL}/contrib/teamcity/upload-coverage.sh" check-extended
     timeout: 4800
     artifacts:
       coverage.tar.gz: coverage.tar.gz
 
   build-diff:
     runOnDiff: true
     Werror: true
     targets:
       - - all
         - install
         - install-secp256k1
       - - check-all
         - check-upgrade-activated
     timeout: 1200
 
   build-docs:
     targets:
       - - doc-rpc
+        - install-manpages-html
     timeout: 600
     artifacts:
       doc/*: doc
 
   build-ibd:
     targets:
       - - bitcoind
     post_build: |
       "${TOPLEVEL}/contrib/teamcity/ibd.sh" -disablewallet -debug=net
     timeout: 14400
     artifacts:
       ibd/debug.log: log/debug.log
 
   build-ibd-no-assumevalid-checkpoint:
     targets:
       - - bitcoind
     post_build: |
       "${TOPLEVEL}/contrib/teamcity/ibd.sh" -disablewallet -assumevalid=0 -checkpoints=0 -debug=net
     timeout: 21600
     artifacts:
       ibd/debug.log: log/debug.log
 
   build-linux32:
     cross_build:
       static_depends: linux32
       toolchain: Linux32
     templates:
       - check+secp256k1
     timeout: 3600
 
   build-linux64:
     cross_build:
       static_depends: linux64
       toolchain: Linux64
     templates:
       - check+secp256k1
     timeout: 3600
 
   build-linux-aarch64:
     cross_build:
       static_depends: linux-aarch64
       toolchain: LinuxAArch64
       emulator: qemu-aarch64-static
     cmake_flags:
       # The ZMQ functional test will fail with qemu (due to a qemu limitation),
       # so disable it to avoid the failure.
       # Extracted from stderr:
       #   Unknown host QEMU_IFLA type: 50
       #   Unknown host QEMU_IFLA type: 51
       #   Unknown QEMU_IFLA_BRPORT type 33
       - "-DBUILD_BITCOIN_ZMQ=OFF"
       # This is an horrible hack to workaround a qemu bug:
       # https://bugs.launchpad.net/qemu/+bug/1748612
       # Qemu emits a message for unsupported features called by the guest.
       # Because the output filtering is not working at all, it causes the
       # qemu stderr to end up in the node stderr and fail the functional
       # tests.
       # Disabling the unsupported feature (here bypassing the config
       # detection) fixes the issue.
       # FIXME: get rid of the hack, either by using a better qemu version
       # or by filtering stderr at the framework level.
       - "-DHAVE_DECL_GETIFADDRS=OFF"
     templates:
       - check+secp256k1
     timeout: 3600
     env:
       QEMU_LD_PREFIX: /usr/aarch64-linux-gnu
 
   build-linux-arm:
     cross_build:
       static_depends: linux-arm
       toolchain: LinuxARM
       emulator: qemu-arm-static
     cmake_flags:
       # The ZMQ functional test will fail with qemu (due to a qemu limitation),
       # so disable it to avoid the failure.
       # Extracted from stderr:
       #   Unknown host QEMU_IFLA type: 50
       #   Unknown host QEMU_IFLA type: 51
       #   Unknown QEMU_IFLA_BRPORT type 33
       - "-DBUILD_BITCOIN_ZMQ=OFF"
       # This is an horrible hack to workaround a qemu bug:
       # https://bugs.launchpad.net/qemu/+bug/1748612
       # Qemu emits a message for unsupported features called by the guest.
       # Because the output filtering is not working at all, it causes the
       # qemu stderr to end up in the node stderr and fail the functional
       # tests.
       # Disabling the unsupported feature (here bypassing the config
       # detection) fixes the issue.
       # FIXME: get rid of the hack, either by using a better qemu version
       # or by filtering stderr at the framework level.
       - "-DHAVE_DECL_GETIFADDRS=OFF"
     templates:
       - check+secp256k1
     timeout: 3600
     env:
       QEMU_LD_PREFIX: /usr/arm-linux-gnueabihf
 
   build-make-generator:
     generator:
       name: 'Unix Makefiles'
       command: make
       flags:
         - '-k'
     templates:
       - check+secp256k1
     timeout: 1200
 
   build-master:
     Werror: true
     targets:
       - - all
         - install
         - install-secp256k1
       - - check-extended
         - check-upgrade-activated-extended
     timeout: 4800
 
   build-osx:
     cross_build:
       static_depends: osx
       toolchain: OSX
     targets:
       - - all
         - install
         - install-secp256k1
         - install-tests
     post_build: |
       export PYTHONPATH="${TOPLEVEL}/depends/x86_64-apple-darwin16/native/lib/python3/dist-packages:${PYTHONPATH:-}"
       ninja osx-dmg
     timeout: 3600
     artifacts:
       Bitcoin-ABC.dmg: Bitcoin-ABC.dmg
 
   build-secp256k1:
     cmake_flags:
       - '-DSECP256K1_ENABLE_MODULE_ECDH=ON'
       - '-DSECP256K1_ENABLE_MODULE_MULTISET=ON'
     templates:
       - secp256k1
     timeout: 600
 
   build-secp256k1-endomorphism:
     cmake_flags:
       - "-DSECP256K1_ENABLE_ENDOMORPHISM=ON"
     templates:
       - secp256k1
     timeout: 600
 
   build-secp256k1-java:
     cmake_flags:
       - '-DSECP256K1_ENABLE_MODULE_ECDH=ON'
       - '-DSECP256K1_ENABLE_JNI=ON'
       - '-DUSE_JEMALLOC=OFF'
     templates:
       - secp256k1
     timeout: 600
 
   build-tsan:
     Werror: true
     clang: true
     cmake_flags:
       - '-DENABLE_SANITIZERS=thread'
     targets:
       - - all
         - install
       - - check
         - check-functional
     timeout: 1800
     env:
       TSAN_OPTIONS: log_path=stdout
 
   build-ubsan:
     Werror: true
     clang: true
     cmake_flags:
       - '-DCMAKE_BUILD_TYPE=Debug'
       - '-DENABLE_SANITIZERS=undefined'
     templates:
       - check+secp256k1
     timeout: 1800
     env:
       UBSAN_OPTIONS: log_path=stdout
 
   build-win64:
     cross_build:
       static_depends: win64
       toolchain: Win64
     cmake_flags:
       - "-DBUILD_BITCOIN_SEEDER=OFF"
       - "-DCPACK_STRIP_FILES=ON"
       - "-DUSE_JEMALLOC=OFF"
     targets:
       - - all
         - install
         - install-secp256k1
         - install-tests
       - - package
     post_build: |
       wine "${ARTIFACT_DIR}/bin/test_bitcoin.exe" --run_test=\!radix_tests,rcu_tests
     timeout: 3600
     artifacts:
       bitcoin-abc-*-x86_64-w64-mingw32.exe: bitcoin-abc-x86_64-w64-mingw32.exe
 
   build-without-bip70:
     Werror: true
     cmake_flags:
       - '-DENABLE_BIP70=OFF'
     targets:
       - - all
         - install
       - - check
         - check-functional
     timeout: 1800
 
   build-without-cli:
     Werror: true
     cmake_flags:
       - '-DBUILD_BITCOIN_CLI=OFF'
     targets:
       - - all
         - install
       - - check-functional
     timeout: 1200
 
   build-without-qt:
     Werror: true
     cmake_flags:
       - '-DBUILD_BITCOIN_QT=OFF'
     targets:
       - - all
         - install
       - - check
     timeout: 1200
 
   build-without-wallet:
     runOnDiff: true
     Werror: true
     cmake_flags:
       - '-DBUILD_BITCOIN_WALLET=OFF'
     targets:
       - - all
         - install
       - - check
         - check-functional
     timeout: 1200
 
   build-without-zmq:
     Werror: true
     cmake_flags:
       - '-DBUILD_BITCOIN_ZMQ=OFF'
     targets:
       - - all
         - install
       - - check
         - check-functional
     timeout: 1800
 
   check-buildbot:
     targets:
       - - check-buildbot
     timeout: 600
 
   check-seeds:
     targets:
       - - bitcoind
         - bitcoin-cli
     post_build: |
       # Run on different ports to avoid a race where the rpc port used in the first run
       # may not be closed in time for the second to start.
       SEEDS_DIR="${TOPLEVEL}"/contrib/seeds
       RPC_PORT=18832 "${SEEDS_DIR}"/check-seeds.sh main 80
       RPC_PORT=18833 "${SEEDS_DIR}"/check-seeds.sh test 70
     timeout: 600
 
   check-source-control-tools:
     cmake_flags:
       - '-DENABLE_SOURCE_CONTROL_TOOLS_TESTS=ON'
     targets:
       - - check-source-control-tools
     timeout: 600
 
   gitian-linux:
     templates:
       - gitian_builds
     env:
       OS_NAME: linux
 
   gitian-osx:
     templates:
       - gitian_builds
     env:
       OS_NAME: osx
 
   gitian-win:
     templates:
       - gitian_builds
     env:
       OS_NAME: win
 
   lint-circular-dependencies:
     runOnDiff: true
     script: test/lint/lint-circular-dependencies.sh
diff --git a/contrib/teamcity/setup-debian-buster.sh b/contrib/teamcity/setup-debian-buster.sh
index d53fbe7ad..ef6b66057 100755
--- a/contrib/teamcity/setup-debian-buster.sh
+++ b/contrib/teamcity/setup-debian-buster.sh
@@ -1,137 +1,139 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 dpkg --add-architecture i386
 
 PACKAGES=(
   arcanist
   automake
   autotools-dev
   binutils
   bsdmainutils
   build-essential
   ccache
   cppcheck
   curl
   flake8
   g++-aarch64-linux-gnu
   g++-arm-linux-gnueabihf
   gettext-base
   git
   golang
   g++-mingw-w64
   gnupg
   gperf
+  help2man
   imagemagick
   jq
   lcov
   less
   lib32stdc++-8-dev
   libboost-all-dev
   libbz2-dev
   libc6-dev:i386
   libcap-dev
   libdb++-dev
   libdb-dev
   libevent-dev
   libjemalloc-dev
   libminiupnpc-dev
   libprotobuf-dev
   libqrencode-dev
   libqt5core5a
   libqt5dbus5
   libqt5gui5
   librsvg2-bin
   libssl-dev
   libtiff-tools
   libtinfo5
   libtool
   libzmq3-dev
   make
   ninja-build
   nsis
   php-codesniffer
   pkg-config
   protobuf-compiler
   python3
   python3-autopep8
   python3-pip
   python3-setuptools
   python3-yaml
   python3-zmq
   qemu-user-static
   qttools5-dev
   qttools5-dev-tools
   software-properties-common
   tar
   wget
+  xvfb
   yamllint
   wine
 )
 
 function join_by() {
   local IFS="$1"
   shift
   echo "$*"
 }
 
 apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get install -y $(join_by ' ' "${PACKAGES[@]}")
 
 BACKPORTS=(
   cmake
   shellcheck
 )
 
 echo "deb http://deb.debian.org/debian buster-backports main" | tee -a /etc/apt/sources.list
 apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get -t buster-backports install -y $(join_by ' ' "${BACKPORTS[@]}")
 
 TEAMCITY_DIR=$(dirname "$0")
 
 # FIXME this should no longer be needed starting with Teamcity 2020.1, which
 # supports Java 11.
 "${TEAMCITY_DIR}/install_openjdk8.sh"
 
 # Install llvm-8 and clang-10
 apt-key add "${TEAMCITY_DIR}"/llvm.pub
 add-apt-repository "deb https://apt.llvm.org/buster/   llvm-toolchain-buster-8  main"
 add-apt-repository "deb https://apt.llvm.org/buster/   llvm-toolchain-buster-10  main"
 apt-get update
 
 LLVM_PACKAGES=(
   clang-10
   clang-format-8
   clang-tidy-8
   clang-tools-8
 )
 DEBIAN_FRONTEND=noninteractive apt-get install -y $(join_by ' ' "${LLVM_PACKAGES[@]}")
 # Make sure clang-10 has highest priority
 update-alternatives --install /usr/bin/clang clang "$(command -v clang-10)" 100
 update-alternatives --install /usr/bin/clang++ clang++ "$(command -v clang++-10)" 100
 update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer "$(command -v llvm-symbolizer-10)" 100
 
 # Use the mingw posix variant
 update-alternatives --set x86_64-w64-mingw32-g++ $(command -v x86_64-w64-mingw32-g++-posix)
 update-alternatives --set x86_64-w64-mingw32-gcc $(command -v x86_64-w64-mingw32-gcc-posix)
 
 # Python library for interacting with teamcity
 pip3 install teamcity-messages
 # Python library for merging nested structures
 pip3 install deepmerge
 # For running Python test suites
 pip3 install pytest
 
 # Install Python dependencies for the build bot
 # Note: Path should be relative to TEAMCITY_DIR since the base image build
 # context may be different than the project root.
 pip3 install -r "${TEAMCITY_DIR}"/../buildbot/requirements.txt
 
 # Install pandoc. The version from buster is outdated, so get a more recent one
 # from github.
 wget https://github.com/jgm/pandoc/releases/download/2.10.1/pandoc-2.10.1-1-amd64.deb
 echo "4515d6fe2bf8b82765d8dfa1e1b63ccb0ff3332d60389f948672eaa37932e936 pandoc-2.10.1-1-amd64.deb" | sha256sum -c
 DEBIAN_FRONTEND=noninteractive dpkg -i pandoc-2.10.1-1-amd64.deb
diff --git a/doc/man/gen-manpages.sh b/doc/man/gen-manpages.sh
index e1e4938f5..7fa7fe9ab 100755
--- a/doc/man/gen-manpages.sh
+++ b/doc/man/gen-manpages.sh
@@ -1,60 +1,69 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C
 
 set -euxo pipefail
 
 usage() {
   cat << EOF
 Usage: $0 bitcoind binary manpage
   bitcoind: path to bitcoind executable
   binary: path to the binary to generate the man pages from
   manpage: output path for the man page
 EOF
 }
 
 if [ $# -ne 3 ]
 then
   usage
   exit 1
 fi
 
 if ! command -v help2man
 then
   echo "help2man is required to run $0, please install it"
   exit 2
 fi
 
+# Unfortunately bitcoin-qt requires a handle on the DISPLAY, even for the
+# --help option. We can spoof an X window using xvfb.
+if ! command -v xvfb-run
+then
+  echo "xvfb is required to run $0 headlessly, please install it"
+  exit 3
+fi
+
 BITCOIND="$1"
 BIN="$2"
 MANPAGE="$3"
 
 if [ ! -x "${BITCOIND}" ]
 then
   echo "${BITCOIND} not found or not executable."
-  exit 3
+  exit 4
 fi
 if [ ! -x "${BIN}" ]
 then
   echo "${BIN} not found or not executable."
-  exit 3
+  exit 5
 fi
 
 mkdir -p "$(dirname ${MANPAGE})"
 
 # The autodetected version git tag can screw up manpage output a little bit
 read -r -a VERSION <<< "$(${BITCOIND} --version | head -n1 | awk -F'[ -]' '{ print $5, $6 }')"
 
 # Create a footer file with copyright content.
 # This gets autodetected fine for bitcoind if --version-string is not set,
 # but has different outcomes for bitcoin-qt and bitcoin-cli.
 FOOTER="$(basename ${BIN})_footer.h2m"
 cleanup() {
   rm -f "${FOOTER}"
 }
 trap "cleanup" EXIT
 echo "[COPYRIGHT]" > "${FOOTER}"
 "${BITCOIND}" --version | sed -n '1!p' >> "${FOOTER}"
 
-help2man -N --version-string="${VERSION[0]}" --include="${FOOTER}" -o "${MANPAGE}" "${BIN}"
+xvfb-run -a -e /dev/stderr \
+  help2man -N --version-string="${VERSION[0]}" --include="${FOOTER}" -o "${MANPAGE}" "${BIN}"
 sed -i "s/\\\-${VERSION[1]}//g" "${MANPAGE}"