diff --git a/packaging/packages/preserves-tools/.gitignore b/packaging/packages/preserves-tools/.gitignore
index 12fb65c..575ea79 100644
--- a/packaging/packages/preserves-tools/.gitignore
+++ b/packaging/packages/preserves-tools/.gitignore
@@ -1 +1,6 @@
+VERSION
 buildlog.*
+preserves-tool.aarch64
+preserves-tool.armv7
+preserves-tool.x86_64
+preserves/
diff --git a/packaging/packages/preserves-tools/APKBUILD b/packaging/packages/preserves-tools/APKBUILD
deleted file mode 120000
index 03734c8..0000000
--- a/packaging/packages/preserves-tools/APKBUILD
+++ /dev/null
@@ -1 +0,0 @@
-APKBUILD.released
\ No newline at end of file
diff --git a/packaging/packages/preserves-tools/APKBUILD b/packaging/packages/preserves-tools/APKBUILD
new file mode 100644
index 0000000..ee672f5
--- /dev/null
+++ b/packaging/packages/preserves-tools/APKBUILD
@@ -0,0 +1,23 @@
+# Contributor: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+# Maintainer: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+pkgname=preserves-tools
+pkgver=$(cat VERSION)
+pkgrel=$(date '+%Y%m%d%H%M%S')
+pkgdesc="Command-line tools for working with Preserves documents"
+url="https://preserves.dev/"
+arch="all"
+license="GPLv3"
+depends=""
+makedepends=""
+source=""
+builddir="$srcdir/"
+options="!check"
+
+build() {
+    :
+}
+
+package() {
+    mkdir -p "$pkgdir/usr/bin"
+    cp -p "$startdir/preserves-tool.${CARCH}" "$pkgdir/usr/bin/preserves-tool"
+}
diff --git a/packaging/packages/preserves-tools/APKBUILD.adhoc b/packaging/packages/preserves-tools/APKBUILD.adhoc
deleted file mode 100644
index efba99b..0000000
--- a/packaging/packages/preserves-tools/APKBUILD.adhoc
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-# Maintainer: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-pkgname=preserves-tools
-pkgver=2.4.0
-pkgrel=0
-pkgdesc="Command-line tools for working with Preserves documents"
-url="https://preserves.dev/"
-arch="all"
-license="GPLv3"
-depends=""
-makedepends=""
-source="
-preserves-tool.aarch64
-preserves-tool.armv7
-preserves-tool.x86_64
-"
-builddir="$srcdir/"
-options="!check"
-
-build() {
-    :
-}
-
-package() {
-    mkdir -p "$pkgdir/usr/bin"
-    cp -p preserves-tool.${CARCH} "$pkgdir/usr/bin/preserves-tool"
-}
-sha512sums="
-0a9f8b80ed78470dfe532e95c114f633db4f5526e579de4b60d9d3c99afa6d1210838dad21518cb0ce4d5413152bc0264a6eaec574b9422d8d69c2c895f34b6e  preserves-tool.aarch64
-7e14e389483a93b9c640c00f2b8d0ebc88b1c814369c925ce99f9a4e023346ab0a35a294c2d5a42d0a9ace75271fc57aca52b0971a9e2888230c8ea99fd562e5  preserves-tool.armv7
-526a77a2dd1356f486b3fc199cf014b21ac565b333f01f4475e42a3d62fb43f986c6701f3b6dd10e18fcaa3866149ce192149685a1073a89cd48f86844f5b69e  preserves-tool.x86_64
-"
diff --git a/packaging/packages/preserves-tools/Makefile.external b/packaging/packages/preserves-tools/Makefile.external
new file mode 100644
index 0000000..a61b1c1
--- /dev/null
+++ b/packaging/packages/preserves-tools/Makefile.external
@@ -0,0 +1,15 @@
+# -*- makefile -*-
+
+prepare: preserves
+	rm -f preserves-tool.$(ARCH)
+	echo nightly > preserves/implementations/rust/rust-toolchain
+	$(MAKE) -C preserves/implementations/rust $(ARCH)-binary-release
+	cp -p preserves/implementations/rust/target/$(ARCH)-*/release/preserves-tool \
+		preserves-tool.$(ARCH)
+	(cd preserves/implementations/rust/preserves-tools && cargo metadata --format-version 1) \
+		| preserves-tool convert --output-format unquoted \
+			--select '. "packages" / [. "name" = "preserves-tools"] . "version"' \
+		> VERSION
+
+preserves:
+	git clone https://gitlab.com/preserves/preserves