diff --git a/contrib/source-control-tools/patch-recipes/archive-release-notes.sh b/contrib/source-control-tools/autogen-recipes/50-archive-release-notes.sh
similarity index 93%
rename from contrib/source-control-tools/patch-recipes/archive-release-notes.sh
rename to contrib/source-control-tools/autogen-recipes/50-archive-release-notes.sh
index 7299221c9..75a571f5a 100755
--- a/contrib/source-control-tools/patch-recipes/archive-release-notes.sh
+++ b/contrib/source-control-tools/autogen-recipes/50-archive-release-notes.sh
@@ -1,33 +1,32 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 TOPLEVEL=$(git rev-parse --show-toplevel)
 
 # shellcheck source=../../utils/compare-version.sh
 source "${TOPLEVEL}"/contrib/utils/compare-version.sh
 RELEASE_NOTES_FILE="${TOPLEVEL}/doc/release-notes.md"
 RELEASE_NOTES_VERSION=$(sed -n "1s/^Bitcoin ABC version \([0-9]\+\.[0-9]\+\.[0-9]\+\).\+$/\1/p" "${RELEASE_NOTES_FILE}")
 RELEASE_NOTES_ARCHIVE="${TOPLEVEL}/doc/release-notes/release-notes-${RELEASE_NOTES_VERSION}.md"
 
 CURRENT_VERSION=""
 get_current_version CURRENT_VERSION
 
 # Compare the versions. We only want to archive the release notes if the
 # current version is greater the our release notes version.
 if version_less_equal "${CURRENT_VERSION}" "${RELEASE_NOTES_VERSION}"
 then
   echo "Current version ${CURRENT_VERSION} <= release-notes version ${RELEASE_NOTES_VERSION}, skip the update"
   exit 0
 fi
 
 # Archive the release notes
 cp "${RELEASE_NOTES_FILE}" "${RELEASE_NOTES_ARCHIVE}"
 
 # Generate a fresh blank release notes file for the new version
 PROJECT_VERSION="${CURRENT_VERSION}" envsubst < "${TOPLEVEL}/doc/release-notes/release-notes.md.in" > "${RELEASE_NOTES_FILE}"
 
 git add "${RELEASE_NOTES_FILE}" "${RELEASE_NOTES_ARCHIVE}"
-git commit -m "[Automated] Archive release notes for version ${RELEASE_NOTES_VERSION}"
diff --git a/contrib/source-control-tools/autogen-recipes/51-update-aur-version.sh b/contrib/source-control-tools/autogen-recipes/51-update-aur-version.sh
new file mode 100755
index 000000000..0c9f31a4b
--- /dev/null
+++ b/contrib/source-control-tools/autogen-recipes/51-update-aur-version.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+export LC_ALL=C.UTF-8
+
+set -euxo pipefail
+
+# Common script to update the AUR packages.
+# Usage: update-aur-version <package_name>
+
+TOPLEVEL=$(git rev-parse --show-toplevel)
+# shellcheck source=../../utils/compare-version.sh
+source "${TOPLEVEL}"/contrib/utils/compare-version.sh
+
+CURRENT_VERSION=""
+get_current_version CURRENT_VERSION
+
+update-aur-version() {
+  PACKAGE="$1"
+
+  # Get the current version of the AUR package
+  PKGBUILD="${TOPLEVEL}"/contrib/aur/${PACKAGE}/PKGBUILD
+  # shellcheck source=../../aur/bitcoin-abc/PKGBUILD
+  source "${PKGBUILD}"
+
+  # Compare the versions. We only want to update if
+  # (software version > package version) to prevent downgrades.
+  if version_less_equal "${CURRENT_VERSION}" "${pkgver}"
+  then
+    echo "Current version ${CURRENT_VERSION} <= ${PACKAGE} AUR package version ${pkgver}, skip the update"
+    return 0
+  fi
+
+  # Reset the release version to 0 and update the package version in the
+  # PKGBUILD file.
+  # Note that this pattern is very safe: because of the shell script syntax,
+  # no whitespace can occur and we have the original value as a variable.
+  sed -i "s/pkgrel=${pkgrel}/pkgrel=0/" "${PKGBUILD}"
+  sed -i "s/pkgver=${pkgver}/pkgver=${CURRENT_VERSION}/" "${PKGBUILD}"
+
+  git add "${PKGBUILD}"
+}
+
+update-aur-version "bitcoin-abc"
+update-aur-version "bitcoin-abc-qt"
diff --git a/contrib/source-control-tools/automated-commits.sh b/contrib/source-control-tools/automated-commits.sh
index e0741ecbc..3e063350f 100755
--- a/contrib/source-control-tools/automated-commits.sh
+++ b/contrib/source-control-tools/automated-commits.sh
@@ -1,86 +1,102 @@
 #!/usr/bin/env bash
 
 # Note: Any bot running this script must have the appropriate permissions to
 # push commits upstream. When running locally, this script will git push in a
 # dry run by default.
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 help_message() {
   cat <<EOF
 $0 [options] [script] [script_args...]
 Generate a commit from available recipes.
 
 The given script may produce a commit. If a commit is generated this way, it will be landed.
 
 Options:
   -h, --help                Display this help message.
 
 Environment Variables:
   DRY_RUN                   If set to 'no', this script will push the generated changes upstream. Default: 'yes'
 EOF
 }
 
 SCRIPT=""
 SCRIPT_ARGS=()
 
 # Parse command line arguments
 while [[ $# -gt 0 ]]; do
 case $1 in
   -h|--help)
     help_message
     exit 0
     ;;
   *)
     SCRIPT="$1"
     shift
     SCRIPT_ARGS=("$@")
     break
     ;;
 esac
 done
 
 LAND_PATCH_ARGS=()
 case ${DRY_RUN:=yes} in
   no|NO|false|FALSE)
     # Nothing to do
     ;;
   *)
     LAND_PATCH_ARGS+=("--dry-run")
     ;;
 esac
 
 OLD_HEAD="$(git rev-parse HEAD)"
 
 echo "Building automated commit using '${SCRIPT}'..."
 
 BOT_PREFIX="[Automated]"
 TOPLEVEL=$(git rev-parse --show-toplevel)
 
 BUILD_DIR="${TOPLEVEL}/abc-ci-builds/automated-commit-$(basename ${SCRIPT})"
 mkdir -p "${BUILD_DIR}"
 export BUILD_DIR
 
 # Make sure tree is clean
 if [ -n "$(git status --porcelain)" ]; then
   echo "Error: The source tree has unexpected changes. Clean up any changes (try 'git stash') and try again."
   exit 10
 fi
 
 if [ ! -f "${SCRIPT}" ]; then
   echo "Error: '${SCRIPT}' does not exist"
   exit 10
 fi
 
 "${SCRIPT}" "${SCRIPT_ARGS[@]}"
 
 # Bail early if there's nothing to land
 if [ "$(git rev-parse HEAD)" == "${OLD_HEAD}" ]; then
   echo "No new changes. Nothing to do."
   exit 0
 fi
 
+# Auto-generated changes. These are amended to the patch rather than landed as
+# their own commit.
+for AUTOGEN_SCRIPT in "${TOPLEVEL}"/contrib/source-control-tools/autogen-recipes/* ; do
+  "${AUTOGEN_SCRIPT}"
+done
+
+echo "The following staged changes will be amended to your patch:"
+git --no-pager diff --cached
+
+# Amend the commit, preserving committer info
+GIT_COMMITTER_EMAIL="$(git show -s --format='%ce')"
+GIT_COMMITTER_NAME="$(git show -s --format='%cn')"
+export GIT_COMMITTER_EMAIL
+export GIT_COMMITTER_NAME
+git commit --amend --no-edit
+
 # Land the generated commit
 "${TOPLEVEL}"/contrib/source-control-tools/land-patch.sh "${LAND_PATCH_ARGS[@]}"
diff --git a/contrib/source-control-tools/land-patch.sh b/contrib/source-control-tools/land-patch.sh
index 4ed7fc696..7c9e99580 100755
--- a/contrib/source-control-tools/land-patch.sh
+++ b/contrib/source-control-tools/land-patch.sh
@@ -1,57 +1,56 @@
 #!/usr/bin/env bash
 # Copyright (c) 2020 The Bitcoin developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 help_message() {
   cat <<EOF
 Usage:
 $0 [options]
 Land a commit on master after running any necessary scripts and sanity checks.
 
 The patch is assumed to have been reviewed or generated from a trusted sourece.
 
 Options:
   -d, --dry-run           Dry run. Does everything but actually landing the change.
   -h, --help              Display this help message.
 EOF
 }
 
 GIT_ARGS=()
 
 # Parse command line arguments
 while [[ $# -gt 0 ]]; do
 case $1 in
   -d|--dry-run)
     GIT_ARGS+=("--dry-run")
     shift # shift past argument
     ;;
   -h|--help)
     help_message
     exit 0
     ;;
   *)
     echo "Error: Unrecognized argument: '$1'"
     help_message
     exit 1
     ;;
 esac
 done
 
 if [[ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]]; then
   echo "Error: This script assumes the commit to land is on master"
   exit 10
 fi
 
 TOPLEVEL=$(git rev-parse --show-toplevel)
-# TODO: Autogen (update version numbers, copyright headers, etc.)
 
 # Sanity checks
 "${TOPLEVEL}"/contrib/devtools/smoke-tests.sh
 
 # Push the change. Phabricator will automatically close the associated revision.
 git push "${GIT_ARGS[@]}" origin master
diff --git a/contrib/source-control-tools/patch-recipes/update-aur-version.sh b/contrib/source-control-tools/patch-recipes/update-aur-version.sh
deleted file mode 100755
index 5e313c747..000000000
--- a/contrib/source-control-tools/patch-recipes/update-aur-version.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-
-export LC_ALL=C.UTF-8
-
-set -euxo pipefail
-
-# Common script to update the AUR packages.
-# Usage: update-aur-version <package_name>
-
-TOPLEVEL=$(git rev-parse --show-toplevel)
-# shellcheck source=../../utils/compare-version.sh
-source "${TOPLEVEL}"/contrib/utils/compare-version.sh
-PACKAGE="$1"
-
-CURRENT_VERSION=""
-get_current_version CURRENT_VERSION
-
-# Get the current version of the AUR package
-PKGBUILD="${TOPLEVEL}"/contrib/aur/${PACKAGE}/PKGBUILD
-# shellcheck source=../../aur/bitcoin-abc/PKGBUILD
-source "${PKGBUILD}"
-
-# Compare the versions. We only want to update if
-# (software version > package version) to prevent downgrades.
-if version_less_equal "${CURRENT_VERSION}" "${pkgver}"
-then
-  echo "Current version ${CURRENT_VERSION} <= ${PACKAGE} AUR package version ${pkgver}, skip the update"
-  exit 0
-fi
-
-# Reset the release version to 0 and update the package version in the
-# PKGBUILD file.
-# Note that this pattern is very safe: because of the shell script syntax,
-# no whitespace can occur and we have the original value as a variable.
-sed -i "s/pkgrel=${pkgrel}/pkgrel=0/" "${PKGBUILD}"
-sed -i "s/pkgver=${pkgver}/pkgver=${CURRENT_VERSION}/" "${PKGBUILD}"
-
-git add "${PKGBUILD}"
-git commit -m "Bump ${PACKAGE} AUR package version to ${CURRENT_VERSION}"