diff --git a/devel/update-from-regular.sh b/devel/update-from-regular.sh
index 66028015..f6ee2692 100755
--- a/devel/update-from-regular.sh
+++ b/devel/update-from-regular.sh
@@ -3,14 +3,23 @@ set -e
 
 package=$1
 variant=$2
-official_packages=${OFFICIAL_PACKAGES:-/run/media/devel/src/svntogit-packages}
+official_packages=${OFFICIAL_PACKAGES:-/run/media/files3/other_projects/arch-packages}
 
 current_variant_file=$package/$variant/PKGBUILD
 source "$current_variant_file"
 variantver=$pkgver
 echo "variant version: $variantver"
 
-regular_file=$official_packages/$package/trunk/PKGBUILD
+regular_dir=$official_packages/$package
+if [[ ! -e $regular_dir ]]; then
+    pushd "$official_packages"
+    pkgctl repo clone "$package"
+    popd
+else
+    git -C "$regular_dir" pull --rebase origin main
+fi
+
+regular_file=$regular_dir/PKGBUILD
 source "$regular_file"
 regularver=$pkgver
 echo "regular version: $regularver"
@@ -20,12 +29,12 @@ if [[ $variantver == "$regularver" ]]; then
     exit 0
 fi
 
-commits=($(git -C "$official_packages" log -n 8 --pretty=format:%H HEAD~1 "$package/trunk/PKGBUILD"))
+commits=($(git -C "$regular_dir" log -n 8 --pretty=format:%H HEAD~1 "PKGBUILD"))
 tempfile=/tmp/regular-pkgbuild
 basecomit=
 for commit in "${commits[@]}"; do
     echo "checking diff as of commit $commit"
-    git -C "$official_packages" show "$commit:$package/trunk/PKGBUILD" > "$tempfile"
+    git -C "$regular_dir" show "$commit:PKGBUILD" > "$tempfile"
     source "$tempfile"
     if [[ $variantver != "$pkgver" ]]; then
         continue
@@ -41,5 +50,5 @@ if [[ ! $basecomit ]]; then
 fi
 
 cd "$package/$variant"
-git -C "$official_packages" diff "$basecomit..origin/master" -- "$package/trunk/PKGBUILD" > regular.diff
-patch -p3 -i regular.diff
+git -C "$regular_dir" diff "$basecomit..origin/main" -- "PKGBUILD" > regular.diff
+patch -p1 -i regular.diff
diff --git a/util-linux/static-compat/PKGBUILD b/util-linux/static-compat/PKGBUILD
index 17963098..6b85bd1c 100644
--- a/util-linux/static-compat/PKGBUILD
+++ b/util-linux/static-compat/PKGBUILD
@@ -4,20 +4,29 @@
 
 _pkgname=util-linux
 pkgname=static-compat-$_pkgname
-_pkgmajor=2.38
-_realver=${_pkgmajor}.1
-pkgver=${_realver/-/}
+_tag='2.40'
+pkgver="${_tag/-/}"
 pkgrel=1
 pkgdesc='Miscellaneous system utilities for Linux'
 url='https://github.com/karelzak/util-linux'
 arch=('x86_64')
 depends=('glibc-static-compat')
 makedepends=('systemd' 'python' 'libcap-ng' 'libxcrypt' 'static-compat-configure')
-license=('GPL2')
+license=(
+  'BSD-2-Clause'
+  'BSD-3-Clause'
+  'BSD-4-Clause-UC'
+  'GPL-2.0-only'
+  'GPL-2.0-or-later'
+  'GPL-3.0-or-later'
+  'ISC'
+  'LGPL-2.1-or-later'
+  'LicenseRef-PublicDomain'
+)
 options=(!emptydirs staticlibs strip)
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
 options=(staticlibs)
-source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${_pkgname}-${_realver}.tar."{xz,sign})
+source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_tag}/${_pkgname}-${_tag}.tar."{xz,sign})
 sha256sums=('60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f'
             'SKIP')
 
diff --git a/wayland/static-compat/PKGBUILD b/wayland/static-compat/PKGBUILD
index 6bc043c2..b1799f26 100644
--- a/wayland/static-compat/PKGBUILD
+++ b/wayland/static-compat/PKGBUILD
@@ -4,8 +4,8 @@
 
 _pkgname=wayland
 pkgname=static-compat-$_pkgname
-pkgver=1.21.0
-pkgrel=2
+pkgver=1.22.0
+pkgrel=1
 pkgdesc='A computer display server protocol'
 arch=('x86_64')
 url='https://wayland.freedesktop.org/'
@@ -16,8 +16,8 @@ makedepends=('static-compat-meson' 'ninja' 'libxslt' 'xmlto' 'doxygen' 'graphviz
 validpgpkeys=('C7223EBE4EF66513B892598911A30156E0E67611'  # Bryce Harrington
               'C0066D7DB8E9AC6844D728715E54498E697F11D7'  # Derek Foreman
               '34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48') # emersion <contact@emersion.fr>
-source=("https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.21.0/downloads/wayland-$pkgver.tar.xz"{,.sig})
-sha256sums=('6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac'
+source=("https://gitlab.freedesktop.org/wayland/wayland/-/releases/$pkgver/downloads/wayland-$pkgver.tar.xz"{,.sig})
+sha256sums=('1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842'
             'SKIP')
 
 build() {
diff --git a/xz/static-compat/PKGBUILD b/xz/static-compat/PKGBUILD
index 5ae97aff..328fa60d 100644
--- a/xz/static-compat/PKGBUILD
+++ b/xz/static-compat/PKGBUILD
@@ -3,43 +3,46 @@
 
 _pkgname=xz
 pkgname=static-compat-$_pkgname
-pkgver=5.4.3
+pkgver=5.6.1
 pkgrel=1
 pkgdesc='Library and command line tools for XZ and LZMA compressed files'
 arch=('x86_64')
 url='https://tukaani.org/xz/'
 license=('GPL' 'LGPL' 'custom')
 depends=('glibc-static-compat')
-makedepends=('static-compat-configure')
+makedepends=('static-compat-configure' 'git' 'po4a' 'doxygen')
 options=(!emptydirs staticlibs)
-validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620'  # Lasse Collin <lasse.collin@tukaani.org>
-              '22D465F2B4C173803B20C6DE59FCF207FEA7F445') # Jia Tan <jiat0218@gmail.com>
-source=("https://tukaani.org/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"{,.sig})
-sha256sums=('1c382e0bc2e4e0af58398a903dd62fff7e510171d2de47a1ebe06d1528e9b7e9'
-            'SKIP')
-sha512sums=('aff0fe166af6df4491a6f5df2372cab100b081452461a0e8c6fd65b72af3f250f16c64d9fb8fd309141e9b9ae4e41649f48687cc29e63dd82f27f2eab19b4023'
-             'SKIP')
+validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620')  # Lasse Collin <lasse.collin@tukaani.org>
+source=("git+https://github.com/tukaani-project/xz#tag=v${pkgver}")
+sha256sums=('e10fa4254d5ff033c78dcbfd2866e79a762b8a719503a7c146758e590de945dc')
+sha512sums=('8f4ee2e5c9b46d0917d8bdf8b172a70d02a6cf2d4d78a2e99ae942e32979b72b407809ffda2885af41e2c9d801c19eab5e4fd73888fbaf042346be957df406fc')
+
+prepare() {
+  cd ${_pkgname}
+
+  ./autogen.sh
+}
 
 build() {
-	source static-compat-environment
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+  source static-compat-environment
+  cd ${_pkgname}
 
-	static-compat-configure --disable-shared --enable-static --disable-rpath
-	make
+  static-compat-configure --disable-shared --enable-static --disable-rpath
+  make
 }
 
 check() {
-	source static-compat-environment
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	make check
+  source static-compat-environment
+  cd ${_pkgname}
+  make check
 }
 
 package() {
-	source static-compat-environment
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}/"
-	ln -sf /usr/static/share/doc/xz/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-	rm -r "$pkgdir/$static_compat_prefix"/bin
-	rm -r "$pkgdir/$static_compat_prefix"/share/{man,doc,locale}
+  source static-compat-environment
+  cd ${_pkgname}
+  make DESTDIR="${pkgdir}" install
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}/"
+  ln -sf /usr/static/share/doc/xz/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  rm -r "$pkgdir/$static_compat_prefix"/bin
+  rm -r "$pkgdir/$static_compat_prefix"/share/{man,doc,locale}
 }