diff --git a/packaging/packages/squeak-cog-vm/APKBUILD b/packaging/packages/squeak-cog-vm/APKBUILD
index 1455d23..a5ff705 100644
--- a/packaging/packages/squeak-cog-vm/APKBUILD
+++ b/packaging/packages/squeak-cog-vm/APKBUILD
@@ -1,17 +1,18 @@
 # Contributor: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 # Maintainer: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 pkgname=squeak-cog-vm
-pkgver=202112201228
-pkgrel=1
+pkgver=202206021410
+pkgrel=0
 pkgdesc="Squeak Spur Cog (JIT) Virtual Machine"
 url="https://opensmalltalk.org/"
 arch="all"
 license="MIT"
 depends=""
-makedepends="git bash linux-headers alsa-lib-dev openssl-dev libevdev-dev mesa-dev"
+makedepends="git bash linux-headers alsa-lib-dev openssl-dev libevdev-dev mesa-dev libxrandr-dev"
 source="
 $pkgname-$pkgver.tar.gz::https://github.com/OpenSmalltalk/opensmalltalk-vm/archive/refs/tags/$pkgver.tar.gz
-http://files.squeak.org/sources_files/SqueakV50.sources.gz
+https://files.squeak.org/sources_files/SqueakV50.sources.gz
+https://files.squeak.org/sources_files/SqueakV60.sources.gz
 "
 builddir="$srcdir/opensmalltalk-vm-$pkgver"
 options="!check"
@@ -67,12 +68,14 @@ package() {
     cp -rp lib/squeak/*/. "$pkgdir/usr/lib/squeak/."
 
     gzip -dc ../../../SqueakV50.sources.gz > "$pkgdir/usr/lib/squeak/SqueakV50.sources"
+    gzip -dc ../../../SqueakV60.sources.gz > "$pkgdir/usr/lib/squeak/SqueakV60.sources"
 
     mkdir -p "$pkgdir/usr/bin"
     ln -sf /usr/lib/squeak/squeak "$pkgdir/usr/bin/squeak"
 }
 
 sha512sums="
-8f86d47bc0351403d3066d5b41d36d2dd4c9d0969d2dd470c4f392e61b0e0e15008212a40eb467c5010df0874f05eb82348baa1d6e6e05c04aa11dc2613f4423  squeak-cog-vm-202112201228.tar.gz
+a72b221eb76178d8d80134b58523bddb5ae480d1497a4b1cbd7079268b9687f3ddf06e391557abcb2e8ec0db972ebbb9529affea8eed41753252ac986abc3905  squeak-cog-vm-202206021410.tar.gz
 3571f4c8c11aed1005f885fa0b2eb56cea011eb77c162619e29bd36ecb3161083b7a4808973d08c1271509fc6386d8f5e3b5eabab9193ec56c31c93d1379656e  SqueakV50.sources.gz
+22272ca74c1a7021b5f49614046e1ca779ddea7cff84ca64c752163ffbdf9c7d5870eb56b7cfb208dc41a3e7ed75ac0623f07cab8054de3ff622885739a0e2c8  SqueakV60.sources.gz
 "
diff --git a/packaging/packages/squeak-stack-vm/APKBUILD b/packaging/packages/squeak-stack-vm/APKBUILD
index 5e4298d..97b8b7b 100644
--- a/packaging/packages/squeak-stack-vm/APKBUILD
+++ b/packaging/packages/squeak-stack-vm/APKBUILD
@@ -1,17 +1,18 @@
 # Contributor: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 # Maintainer: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 pkgname=squeak-stack-vm
-pkgver=202107301330
-pkgrel=1
+pkgver=202206021410
+pkgrel=0
 pkgdesc="Squeak Spur stack (non-JIT) Virtual Machine"
 url="https://opensmalltalk.org/"
 arch="all"
 license="MIT"
 depends=""
-makedepends="git bash linux-headers alsa-lib-dev openssl-dev libevdev-dev mesa-dev"
+makedepends="git bash linux-headers alsa-lib-dev openssl-dev libevdev-dev mesa-dev libxrandr-dev"
 source="
 $pkgname-$pkgver.tar.gz::https://github.com/OpenSmalltalk/opensmalltalk-vm/archive/refs/tags/$pkgver.tar.gz
-http://files.squeak.org/sources_files/SqueakV50.sources.gz
+https://files.squeak.org/sources_files/SqueakV50.sources.gz
+https://files.squeak.org/sources_files/SqueakV60.sources.gz
 "
 builddir="$srcdir/opensmalltalk-vm-$pkgver"
 options="!check"
@@ -21,14 +22,13 @@ build() {
     echo 'false' > ./scripts/checkSCCSversion
     case "$CARCH" in
         aarch64)
-            cd build.linux64ARMv8
+            cd building/linux64ARMv8
             ;;
         x86_64)
-            cd build.linux64x64
+            cd building/linux64x64
             sed -i \
                 -e 's:^OPT="\(.*\)":OPT="\1 -DMUSL -D_GNU_SOURCE -DUSEEVDEV":' \
                 -e 's:without\(-vm-display-fbdev\):with\1:' \
-                -e 's:CC=clang::' \
                 squeak.stack.spur/build/mvm
             ;;
         *)
@@ -69,12 +69,14 @@ package() {
     cp -rp lib/squeak/*/. "$pkgdir/usr/lib/squeak/."
 
     gzip -dc ../../../SqueakV50.sources.gz > "$pkgdir/usr/lib/squeak/SqueakV50.sources"
+    gzip -dc ../../../SqueakV60.sources.gz > "$pkgdir/usr/lib/squeak/SqueakV60.sources"
 
     mkdir -p "$pkgdir/usr/bin"
     ln -sf /usr/lib/squeak/squeak "$pkgdir/usr/bin/squeak"
 }
 
 sha512sums="
-3ea16d90bc64b53b1e865b7e7e84457d564b60de2b8a2179c52528c1c1a574177a4aa933b634de5dd8d82557ea1bd7e453a119dfabdad133dc47eca7c8ca6aa8  squeak-stack-vm-202107301330.tar.gz
+a72b221eb76178d8d80134b58523bddb5ae480d1497a4b1cbd7079268b9687f3ddf06e391557abcb2e8ec0db972ebbb9529affea8eed41753252ac986abc3905  squeak-stack-vm-202206021410.tar.gz
 3571f4c8c11aed1005f885fa0b2eb56cea011eb77c162619e29bd36ecb3161083b7a4808973d08c1271509fc6386d8f5e3b5eabab9193ec56c31c93d1379656e  SqueakV50.sources.gz
+22272ca74c1a7021b5f49614046e1ca779ddea7cff84ca64c752163ffbdf9c7d5870eb56b7cfb208dc41a3e7ed75ac0623f07cab8054de3ff622885739a0e2c8  SqueakV60.sources.gz
 "