diff --git a/.github/workflows/Generate-PR.yml b/.github/workflows/Generate-PR.yml
index 7e5f50f6c2..dfb7764bfd 100644
--- a/.github/workflows/Generate-PR.yml
+++ b/.github/workflows/Generate-PR.yml
@@ -444,7 +444,7 @@ jobs:
         id: changed-files
         uses: tj-actions/changed-files@v47
         with:
-          base_sha: ${{ github.event.pull_request.head.sha }}
+          base_sha: ${{ steps.get-current-head.outputs.CURRENT_HEAD }}
           files_yaml: |
             manifest:
               - manifest/**
diff --git a/manifest/armv7l/s/sord.filelist b/manifest/armv7l/s/sord.filelist
index 42d73fa54d..a5a7ed1664 100644
--- a/manifest/armv7l/s/sord.filelist
+++ b/manifest/armv7l/s/sord.filelist
@@ -1,9 +1,11 @@
-# Total size: 76172
+# Total size: 83522
 /usr/local/bin/sord_validate
 /usr/local/bin/sordi
 /usr/local/include/sord-0/sord/sord.h
 /usr/local/include/sord-0/sord/sordmm.hpp
 /usr/local/lib/libsord-0.so
 /usr/local/lib/libsord-0.so.0
-/usr/local/lib/libsord-0.so.0.16.14
+/usr/local/lib/libsord-0.so.0.16.20
 /usr/local/lib/pkgconfig/sord-0.pc
+/usr/local/share/man/man1/sord_validate.1.zst
+/usr/local/share/man/man1/sordi.1.zst
diff --git a/manifest/armv7l/z/zix.filelist b/manifest/armv7l/z/zix.filelist
new file mode 100644
index 0000000000..5ed23a66b2
--- /dev/null
+++ b/manifest/armv7l/z/zix.filelist
@@ -0,0 +1,22 @@
+# Total size: 112701
+/usr/local/include/zix-0/zix/allocator.h
+/usr/local/include/zix-0/zix/attributes.h
+/usr/local/include/zix-0/zix/btree.h
+/usr/local/include/zix-0/zix/bump_allocator.h
+/usr/local/include/zix-0/zix/digest.h
+/usr/local/include/zix-0/zix/environment.h
+/usr/local/include/zix-0/zix/filesystem.h
+/usr/local/include/zix-0/zix/hash.h
+/usr/local/include/zix-0/zix/path.h
+/usr/local/include/zix-0/zix/ring.h
+/usr/local/include/zix-0/zix/sem.h
+/usr/local/include/zix-0/zix/status.h
+/usr/local/include/zix-0/zix/string_view.h
+/usr/local/include/zix-0/zix/thread.h
+/usr/local/include/zix-0/zix/tree.h
+/usr/local/include/zix-0/zix/warnings.h
+/usr/local/include/zix-0/zix/zix.h
+/usr/local/lib/libzix-0.so
+/usr/local/lib/libzix-0.so.0
+/usr/local/lib/libzix-0.so.0.8.0
+/usr/local/lib/pkgconfig/zix-0.pc
diff --git a/manifest/i686/s/sord.filelist b/manifest/i686/s/sord.filelist
index 1dbe861978..c6b89a081e 100644
--- a/manifest/i686/s/sord.filelist
+++ b/manifest/i686/s/sord.filelist
@@ -1,9 +1,11 @@
-# Total size: 88632
+# Total size: 101242
 /usr/local/bin/sord_validate
 /usr/local/bin/sordi
 /usr/local/include/sord-0/sord/sord.h
 /usr/local/include/sord-0/sord/sordmm.hpp
 /usr/local/lib/libsord-0.so
 /usr/local/lib/libsord-0.so.0
-/usr/local/lib/libsord-0.so.0.16.14
+/usr/local/lib/libsord-0.so.0.16.20
 /usr/local/lib/pkgconfig/sord-0.pc
+/usr/local/share/man/man1/sord_validate.1.zst
+/usr/local/share/man/man1/sordi.1.zst
diff --git a/manifest/i686/z/zix.filelist b/manifest/i686/z/zix.filelist
new file mode 100644
index 0000000000..b145a4238b
--- /dev/null
+++ b/manifest/i686/z/zix.filelist
@@ -0,0 +1,22 @@
+# Total size: 133961
+/usr/local/include/zix-0/zix/allocator.h
+/usr/local/include/zix-0/zix/attributes.h
+/usr/local/include/zix-0/zix/btree.h
+/usr/local/include/zix-0/zix/bump_allocator.h
+/usr/local/include/zix-0/zix/digest.h
+/usr/local/include/zix-0/zix/environment.h
+/usr/local/include/zix-0/zix/filesystem.h
+/usr/local/include/zix-0/zix/hash.h
+/usr/local/include/zix-0/zix/path.h
+/usr/local/include/zix-0/zix/ring.h
+/usr/local/include/zix-0/zix/sem.h
+/usr/local/include/zix-0/zix/status.h
+/usr/local/include/zix-0/zix/string_view.h
+/usr/local/include/zix-0/zix/thread.h
+/usr/local/include/zix-0/zix/tree.h
+/usr/local/include/zix-0/zix/warnings.h
+/usr/local/include/zix-0/zix/zix.h
+/usr/local/lib/libzix-0.so
+/usr/local/lib/libzix-0.so.0
+/usr/local/lib/libzix-0.so.0.8.0
+/usr/local/lib/pkgconfig/zix-0.pc
diff --git a/manifest/x86_64/s/sord.filelist b/manifest/x86_64/s/sord.filelist
index 7c640bc18e..6638ec2618 100644
--- a/manifest/x86_64/s/sord.filelist
+++ b/manifest/x86_64/s/sord.filelist
@@ -1,9 +1,11 @@
-# Total size: 94130
+# Total size: 102264
 /usr/local/bin/sord_validate
 /usr/local/bin/sordi
 /usr/local/include/sord-0/sord/sord.h
 /usr/local/include/sord-0/sord/sordmm.hpp
 /usr/local/lib64/libsord-0.so
 /usr/local/lib64/libsord-0.so.0
-/usr/local/lib64/libsord-0.so.0.16.14
+/usr/local/lib64/libsord-0.so.0.16.20
 /usr/local/lib64/pkgconfig/sord-0.pc
+/usr/local/share/man/man1/sord_validate.1.zst
+/usr/local/share/man/man1/sordi.1.zst
diff --git a/manifest/x86_64/z/zix.filelist b/manifest/x86_64/z/zix.filelist
new file mode 100644
index 0000000000..57c0c57e9d
--- /dev/null
+++ b/manifest/x86_64/z/zix.filelist
@@ -0,0 +1,22 @@
+# Total size: 133291
+/usr/local/include/zix-0/zix/allocator.h
+/usr/local/include/zix-0/zix/attributes.h
+/usr/local/include/zix-0/zix/btree.h
+/usr/local/include/zix-0/zix/bump_allocator.h
+/usr/local/include/zix-0/zix/digest.h
+/usr/local/include/zix-0/zix/environment.h
+/usr/local/include/zix-0/zix/filesystem.h
+/usr/local/include/zix-0/zix/hash.h
+/usr/local/include/zix-0/zix/path.h
+/usr/local/include/zix-0/zix/ring.h
+/usr/local/include/zix-0/zix/sem.h
+/usr/local/include/zix-0/zix/status.h
+/usr/local/include/zix-0/zix/string_view.h
+/usr/local/include/zix-0/zix/thread.h
+/usr/local/include/zix-0/zix/tree.h
+/usr/local/include/zix-0/zix/warnings.h
+/usr/local/include/zix-0/zix/zix.h
+/usr/local/lib64/libzix-0.so
+/usr/local/lib64/libzix-0.so.0
+/usr/local/lib64/libzix-0.so.0.8.0
+/usr/local/lib64/pkgconfig/zix-0.pc
diff --git a/packages/sord.rb b/packages/sord.rb
index 977a65087c..4ad8d2c350 100644
--- a/packages/sord.rb
+++ b/packages/sord.rb
@@ -6,24 +6,25 @@ require 'buildsystems/meson'
 class Sord < Meson
   description 'A lightweight C library for storing RDF data in memory'
   homepage 'https://drobilla.net/software/sord/'
-  version '0.16.14'
+  version '0.16.20'
   license 'ISC'
   compatibility 'all'
-  source_url 'https://github.com/drobilla/sord.git'
+  source_url 'https://gitlab.com/drobilla/sord.git'
   git_hashtag "v#{version}"
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: 'c9667c90d72b3604b7ecda2fc66ea57e2d2d3bf0b8593b195d5286c9170bf19f',
-     armv7l: 'c9667c90d72b3604b7ecda2fc66ea57e2d2d3bf0b8593b195d5286c9170bf19f',
-       i686: '44c32a9b15f9cc90e5b70e11d26880efa75ce577cfa602b465047dffbe069a7c',
-     x86_64: '260e36fbe792e2ee149ee8c0de2e97459b446ce4a1c3b34f334fb4ef25f45da2'
+    aarch64: '4dceccc727b85b7a0bb7ca396068136191a18127441ed722928e34471c884a1c',
+     armv7l: '4dceccc727b85b7a0bb7ca396068136191a18127441ed722928e34471c884a1c',
+       i686: 'fd691f1028ba28f0b5a26863ef6e5c0a62d3d50970656d9d0d6adfdee87752e6',
+     x86_64: '178d27e5a53980a357cd18b5f9b20c28c31c6504863d2b99baea46bb30c3108d'
   })
 
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
-  depends_on 'pcre' # R
+  depends_on 'pcre2' # R
   depends_on 'serd' # R
+  depends_on 'zix' # R
 
   meson_options '-Ddocs=disabled \
                -Dtests=disabled'
diff --git a/packages/zix.rb b/packages/zix.rb
new file mode 100644
index 0000000000..8c48b4b764
--- /dev/null
+++ b/packages/zix.rb
@@ -0,0 +1,24 @@
+# Adapted from Arch Linux zix PKGBUILD at:
+# https://gitlab.archlinux.org/archlinux/packaging/packages/zix/-/blob/main/PKGBUILD?ref_type=heads
+
+require 'buildsystems/meson'
+
+class Zix < Meson
+  description 'A lightweight C99 portability and data structure library'
+  homepage 'https://gitlab.com/drobilla/zix'
+  version '0.8.0'
+  license '0BSD OR ISC'
+  compatibility 'all'
+  source_url 'https://gitlab.com/drobilla/zix.git'
+  git_hashtag "v#{version}"
+  binary_compression 'tar.zst'
+
+  binary_sha256({
+    aarch64: '53fcab8ea102cde913a61df8fde58198f3d69095a8f70689c5f91d9a1f9b3d14',
+     armv7l: '53fcab8ea102cde913a61df8fde58198f3d69095a8f70689c5f91d9a1f9b3d14',
+       i686: '4cece6cdbf6d5b79a1892fbc379c6110aa0a9ab252b5358d31a5d1e8740507d5',
+     x86_64: '8ab8cedd9c499bc5cbe9a1845050857d8485ef3bb44dade7b3b106fccbaabb4a'
+  })
+
+  depends_on 'glibc' # R
+end
diff --git a/tools/packages.yaml b/tools/packages.yaml
index bc1799b08d..d9b1456263 100644
--- a/tools/packages.yaml
+++ b/tools/packages.yaml
@@ -10650,6 +10650,11 @@ url: https://sourceforge.net/projects/infozip/files/Zip%203.x%20%28latest%29/
 activity: none
 ---
 kind: url
+name: zix
+url: https://gitlab.com/drobilla/zix/-/releases
+activity: low
+---
+kind: url
 name: zlib
 url: http://www.zlib.net
 activity: none