diff --git a/regenerate-hackage-packages-with-local-hackage2nix.sh b/regenerate-hackage-packages-with-local-hackage2nix.sh
new file mode 100644
index 000000000..eca239d68
--- /dev/null
+++ b/regenerate-hackage-packages-with-local-hackage2nix.sh
@@ -0,0 +1,15 @@
+#! /usr/bin/env bash
+
+set -eu -o pipefail
+
+exit_trap()
+{
+  local lc="$BASH_COMMAND" rc=$?
+  test $rc -eq 0 || echo "*** error $rc: $lc"
+}
+
+trap exit_trap EXIT
+
+cd "$(dirname "$0")/nixpkgs"
+
+./maintainers/scripts/regenerate-hackage-packages.sh "cabal new-run hackage2nix --"
diff --git a/update-hackage-snapshot.sh b/update-hackage-snapshot.sh
deleted file mode 100755
index 52e456f65..000000000
--- a/update-hackage-snapshot.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env bash
-
-set -eu -o pipefail
-
-rev=$( git ls-remote --heads git://github.com/commercialhaskell/all-cabal-hashes.git hackage \
-     | cut -f1
-     )
-url="https://github.com/commercialhaskell/all-cabal-hashes/archive/$rev.tar.gz"
-sha=$( nix-prefetch-url "$url" )
-
-sed -e "s|url = .*;|url = \"$url\";|"           \
-    -e "s|sha256 = .*;|sha256 = \"$sha\";|"     \
-    -i nixpkgs/pkgs/data/misc/hackage/default.nix
-
-cat <<EOF
-Verify that the new snapshot actually works:
-
-nix-build --no-out-link -E 'with (import ./nixpkgs {}); haskellPackages.callHackage "hsdns" "1.7.1" {}'
-EOF
diff --git a/update-nixpkgs.sh b/update-nixpkgs.sh
index fac0f83be..fae2bc2d6 100755
--- a/update-nixpkgs.sh
+++ b/update-nixpkgs.sh
@@ -10,38 +10,23 @@ exit_trap()
 
 trap exit_trap EXIT
 
-cd "$(dirname "$0")"
-cabal2nix=$(git describe --dirty)
+cd "$(dirname "$0")/nixpkgs"
 
-cd nixpkgs
 git reset -q --hard
 git clean -dxf -q
 git pull -q
-export NIX_PATH=nixpkgs=$PWD
-cd ..
 
-cd hackage
-git pull -q
-rm -f preferred-versions
-for n in */preferred-versions; do
-  cat >>preferred-versions "$n"
-  echo >>preferred-versions
-done
-hackage=$(git rev-parse --verify HEAD)
-cd ..
-
-# This command needs a recent development version of cabal-install. I don't
-# think this works properly in version 2.0.0.0 already.
-cabal -v0 new-run hackage2nix -- --nixpkgs="$PWD/nixpkgs" +RTS -M4G -RTS
-
-cd nixpkgs
+./maintainers/scripts/update-cabal2nix-latest.sh
+
+./maintainers/scripts/update-hackage.sh
+
+./maintainers/scripts/regenerate-hackage-packages.sh
+
 git add pkgs/development/haskell-modules
+git add pkgs/data/misc/hackage
 if [ -n "$(git status --porcelain)" ]; then
   cat <<EOF | git commit -n -q -F -
 hackage-packages.nix: automatic Haskell package set update
-
-This update was generated by hackage2nix $cabal2nix from Hackage revision
-https://github.com/commercialhaskell/all-cabal-hashes/commit/$hackage.
 EOF
   git push -q
 fi