diff --git a/contrib/release/debian-packages.sh b/contrib/release/debian-packages.sh
index 7a0f47784..a5e60fce3 100755
--- a/contrib/release/debian-packages.sh
+++ b/contrib/release/debian-packages.sh
@@ -1,191 +1,191 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C
 
 set -euo pipefail
 
 DEFAULT_PPA="bitcoin-abc"
 DPUT_CONFIG_FILE=~/".dput.cf"
 TOPLEVEL="$(git rev-parse --show-toplevel)"
 KEYS_TXT="${TOPLEVEL}"/contrib/gitian-signing/keys.txt
 
 help_message() {
   echo "Build and sign Debian packages and push to a PPA."
   echo "Usage: $0 <options> signer"
   echo
   echo "Example usage: $0 jasonbcox"
   echo
   echo "signer will be used to fetch the signing key fingerprint from '${KEYS_TXT}'"
   echo "  That matching fingerprint will be used to fetch the correctly formatted name and email from GPG."
   echo "  signer must at least partially match the fingerprint or email in keys.txt"
   echo
   echo "Note: This script will prompt you to sign with your PGP key."
   echo
   echo "-d, --dry-run             Build and sign the packages, but do not push them to the PPA."
   echo "-h, --help                Display this help message."
   echo "-p, --ppa <ppa-name>      PPA hostname. Defaults to: '${DEFAULT_PPA}'. If no config file exists at ${DPUT_CONFIG_FILE}"
   echo "                            then one will be created using '${DEFAULT_PPA}'. Setting this option to a hostname other than"
   echo "                            the default will require that you add the necessary settings to the config file."
   echo "-v, --version <version>   Set the package version. Defaults to the version returned by 'bitcoind --version'."
   echo "                            If set, version must be of the form: MAJOR.MINOR.REVISION[.OPTIONALPATCH]"
   echo "                            OPTIONALPATCH may be necessary when source files have changed but the version revision has not,"
   echo "                            as the PPA will reject source archives of the same name."
 }
 
 DRY_RUN="false"
 NUM_EXPECTED_ARGUMENTS=1
 PACKAGE_VERSION=""
 PPA="${DEFAULT_PPA}"
 
 # Parse command line arguments
 while [[ $# -ne 0 ]]; do
 case $1 in
   -d|--dry-run)
     DRY_RUN="true"
     shift # shift past argument
     ;;
   -h|--help)
     help_message
     exit 0
     ;;
   -p|--ppa)
     PPA="$2"
     shift # shift past argument
     shift # shift past value
     ;;
   -v|--version)
     PACKAGE_VERSION="$2"
     echo "${PACKAGE_VERSION}" | grep -E "[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?" || {
       echo "Error: package_version is not formatted correctly"
       echo
       help_message
       exit 20
     }
     shift # shift past argument
     shift # shift past value
     ;;
   *)
     if [ "$#" -le "${NUM_EXPECTED_ARGUMENTS}" ]; then
       break
     fi
     echo "Unknown argument: $1"
     help_message
     exit 1
     ;;
 esac
 done
 
 # Check for dependencies
 if ! command -v dput > /dev/null; then
   echo "Error: 'dput' is not installed."
   exit 10
 fi
 if ! command -v debuild > /dev/null; then
   echo "Error: 'debuild' is not installed."
   exit 11
 fi
 
 if [ "$#" -ne "${NUM_EXPECTED_ARGUMENTS}" ]; then
   echo "Error: Expects ${NUM_EXPECTED_ARGUMENTS} arguments"
   echo
   help_message
   exit 20
 fi
 
 SIGNER_FINGERPRINT=$(grep "$1" "${KEYS_TXT}" | cut -d' ' -f 1) || {
   echo "Error: Signer '$1' does not match any line in '${KEYS_TXT}'"
   exit 21
 }
 NUM_FINGERPRINT_MATCHES=$(echo "${SIGNER_FINGERPRINT}" | wc -l)
 if [ "${NUM_FINGERPRINT_MATCHES}" -ne 1 ]; then
   echo "Error: '$1' is expected to match only one line in '${KEYS_TXT}'. Got '${NUM_FINGERPRINT_MATCHES}'"
   exit 22
 fi
 
 SIGNER=$(gpg --list-key "${SIGNER_FINGERPRINT}" | grep -o "\[ultimate\] .* <.*@.*>" | cut -d' ' -f 2-)
 echo "Signer: ${SIGNER}"
 if [ -z "${SIGNER}" ]; then
   echo "Error: Signer key for '${SIGNER}' not found."
   exit 23
 fi
 
 # Generate default dput config file if none exists
 if [ ! -f ${DPUT_CONFIG_FILE} ]; then
   echo "Info: No dput config file exists. Creating ${DPUT_CONFIG_FILE} now..."
   cat > ${DPUT_CONFIG_FILE} <<EOF
 [${DEFAULT_PPA}]
 fqdn = ppa.launchpad.net
 method = ftp
 incoming = ~bitcoin-abc/ubuntu/ppa/
 login = anonymous
 allow_unsigned_uploads = 0
 EOF
 fi
 
 # Check that the requested PPA hostname exists
 grep "\[${PPA}\]" ${DPUT_CONFIG_FILE} || {
   echo "Error: PPA hostname does not exist in ${DPUT_CONFIG_FILE}"
   exit 30
 }
 
 # Build package source archive
 "${TOPLEVEL}"/contrib/devtools/build_cmake.sh
 pushd "${TOPLEVEL}"/build
 ninja package_source
 
 # Get package version if one wasn't explicitly set
 if [ -z "${PACKAGE_VERSION}" ]; then
   PACKAGE_VERSION=$(./src/bitcoind --version | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")
 fi
 echo "Package version: ${PACKAGE_VERSION}"
 
 # Unpack the package source
 SOURCE_VERSION=$(echo "${PACKAGE_VERSION}" | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
 SOURCE_BASE_NAME="bitcoin-abc-${SOURCE_VERSION}"
 SOURCE_ARCHIVE="${SOURCE_BASE_NAME}.tar.gz"
 tar -zxf "${SOURCE_ARCHIVE}"
 
 # Rename the package source archive. debuild is picky about the naming.
 CONTROL_SOURCE_NAME=$(grep "Source: " "${TOPLEVEL}"/contrib/debian/control | cut -c 9-)
 PACKAGE_BASE_NAME="${CONTROL_SOURCE_NAME}_${PACKAGE_VERSION}"
 PACKAGE_ARCHIVE="${PACKAGE_BASE_NAME}.orig.tar.gz"
 mv "${SOURCE_ARCHIVE}" "${PACKAGE_ARCHIVE}"
 
 # Build package files for each supported distribution
 DATE=$(date -R)
 package() {
   DISTRO="$1"
   PACKAGE_NAME="${PACKAGE_BASE_NAME}-${DISTRO}"
 
   pushd "${SOURCE_BASE_NAME}"
   cp -r "${TOPLEVEL}"/contrib/debian .
 
 # Generate the changelog for this package
 # TODO: Incorporate release notes into this changelog
   cat > debian/changelog <<EOF
 ${CONTROL_SOURCE_NAME} (${PACKAGE_VERSION}-${DISTRO}) ${DISTRO}; urgency=medium
 
   * New upstream release.
 
  -- ${SIGNER}  ${DATE}
 EOF
 
   debuild -S
   rm -rf debian
   popd
 
   if [ "${DRY_RUN}" == "false" ]; then
     dput "${PPA}" "${PACKAGE_NAME}_source.changes"
   else
     echo "Info: Dry run. Skipping upload to PPA for '${DISTRO}'."
   fi
 }
 
-# Xenial: Ubuntu 16.04
-package "xenial"
-# Bionic: Ubuntu 18.04 (latest LTS release)
+# Bionic: Ubuntu 18.04 LTS
 package "bionic"
-# Eoan: Ubuntu 19.10 (latest release)
+# Eoan: Ubuntu 19.10
 package "eoan"
+# Focal: Ubuntu 20.04 LTS
+package "focal"
 
 popd
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 50e91e938..51cb31d4c 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,28 +1,31 @@
 Bitcoin ABC version 0.21.5 is now available from:
 
   <https://download.bitcoinabc.org/0.21.5/>
 
 This release includes the following features and fixes:
  - Removed deprecated `getinfo` RPC.
  - Update univalue to 1.0.5
+ - The Official Ubuntu PPA will no longer update the package for the 16.04
+   Xenial version. The most recent versions can still be download from
+   bitcoinabc.org. The PPA is now offering a package for 20.04 Focal.
 
 Tests
 -----
 
 - The regression test chain, that can be enabled by the `-regtest` command line
   flag, now requires transactions to not violate standard policy by default.
   Making the default the same as for mainnet, makes it easier to test mainnet
   behavior on regtest. Be reminded that the testnet still allows non-standard
   txs by default and that the policy can be locally adjusted with the
   `-acceptnonstdtxn` command line flag for both test chains.
 
 Configuration
 ------------
 
 * An error is issued where previously a warning was issued when a setting in
   the config file was specified in the default section, but not overridden for
   the selected network. This change takes only effect if the selected network
   is not mainnet.
 
  - The `echo` RPC will now return an internal bug report if exactly 100
    arguments are provided.