diff --git a/.github/workflows/build-debian11.yml b/.github/workflows/build-debian11.yml
deleted file mode 100644
index bfc663b0..00000000
--- a/.github/workflows/build-debian11.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Debian11 Build Job
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: Build on Debian11
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Set up Git repository
-        uses: actions/checkout@v6
-        with:
-          submodules: recursive
-      - name: Build LTFS
-        id: build
-        uses: LinearTapeFileSystem/Debian11-Build@v1.1.1
-        with:
-          destination: '/tmp/ltfs'
-          submodules: recursive
diff --git a/.github/workflows/build-debian12.yml b/.github/workflows/build-debian12.yml
index db1a76d8..e43f95c6 100644
--- a/.github/workflows/build-debian12.yml
+++ b/.github/workflows/build-debian12.yml
@@ -14,7 +14,7 @@ jobs:
           submodules: recursive
       - name: Build LTFS
         id: build
-        uses: LinearTapeFileSystem/Debian12-Build@v1.0
+        uses: LinearTapeFileSystem/Debian12-Build@v1.1
         with:
           destination: '/tmp/ltfs'
           submodules: recursive
diff --git a/.github/workflows/build-ubuntu-focal.yml b/.github/workflows/build-ubuntu-focal.yml
index 7c23a54d..5cb71698 100644
--- a/.github/workflows/build-ubuntu-focal.yml
+++ b/.github/workflows/build-ubuntu-focal.yml
@@ -14,6 +14,6 @@ jobs:
           submodules: recursive
       - name: Build LTFS
         id: build
-        uses: LinearTapeFileSystem/Ubuntu2004-Build@v1.1
+        uses: LinearTapeFileSystem/Ubuntu2004-Build@v1.2
         with:
           destination: '/tmp/ltfs'
diff --git a/messages/make_message_src.sh b/messages/make_message_src.sh
index b2e7e7b5..e26003b6 100755
--- a/messages/make_message_src.sh
+++ b/messages/make_message_src.sh
@@ -35,6 +35,22 @@ elif [ "$KERNEL_NAME" = "FreeBSD" ]; then
 else
 	if [ -x /usr/bin/genrb ]; then : "${GENRB:=/usr/bin/genrb}"; else : "${GENRB:=genrb}"; fi
 	if [ -x /usr/bin/pkgdata ]; then : "${PKGDATA:=/usr/bin/pkgdata}"; else : "${PKGDATA:=pkgdata}"; fi
+
+	# icu-config was removed in ICU 63+; pkgdata then needs -O <pkgdata.inc>.
+	# Locate pkgdata.inc through pkg-config (the file lives either directly
+	# in <libdir>/icu or in a versioned subdirectory).
+	if [ -z "${ICU_PKGDATA_INC:-}" ] && pkg-config --exists icu-uc 2>/dev/null; then
+		_ICU_LIBDIR=`pkg-config --variable=libdir icu-uc 2>/dev/null`
+		_ICU_VERSION=`pkg-config --modversion icu-uc 2>/dev/null`
+		for _inc in "${_ICU_LIBDIR}/icu/pkgdata.inc" \
+		            "${_ICU_LIBDIR}/icu/${_ICU_VERSION}/pkgdata.inc" \
+		            "${_ICU_LIBDIR}"/icu/*/pkgdata.inc; do
+			if [ -f "$_inc" ]; then
+				ICU_PKGDATA_INC="$_inc"
+				break
+			fi
+		done
+	fi
 fi
 
 if [ "$#" -lt "1" ]; then
@@ -69,7 +85,7 @@ make_obj() {
 	# Generate the resource files, then package them statically.
 	${GENRB} -d "$WORK" -q "${SRC_DIR}"/*.txt
 	( cd "$WORK" && ls *.res > packagelist.txt && \
-	  ${PKGDATA} -p ${BASENAME} -m static -q packagelist.txt >/dev/null )
+	  ${PKGDATA} ${ICU_PKGDATA_INC:+-O "$ICU_PKGDATA_INC"} -p ${BASENAME} -m static -q packagelist.txt >/dev/null )
 
 	case $KERNEL_NAME in
 		MINGW32_NT*)