diff -pruN 7.8.git20221117.28daf24+dfsg-3/debian/changelog 7.8.git20221117.28daf24+dfsg-4/debian/changelog
--- 7.8.git20221117.28daf24+dfsg-3/debian/changelog	2023-07-04 00:09:56.000000000 +0000
+++ 7.8.git20221117.28daf24+dfsg-4/debian/changelog	2024-01-03 00:43:58.000000000 +0000
@@ -1,3 +1,10 @@
+heimdal (7.8.git20221117.28daf24+dfsg-4) unstable; urgency=medium
+
+  * Always build the rk_strlcat and rk_strlcpy symbols even if included in
+    glibc. Closes: #1055316.
+
+ -- Brian May <bam@debian.org>  Wed, 03 Jan 2024 11:43:58 +1100
+
 heimdal (7.8.git20221117.28daf24+dfsg-3) unstable; urgency=medium
 
   * Fix random "Ticket expired" and "Clock skew too great" errors by setting
diff -pruN 7.8.git20221117.28daf24+dfsg-3/debian/patches/0022-Always-build-rk_strlcat-and-rk_strlcpy-symbols.patch 7.8.git20221117.28daf24+dfsg-4/debian/patches/0022-Always-build-rk_strlcat-and-rk_strlcpy-symbols.patch
--- 7.8.git20221117.28daf24+dfsg-3/debian/patches/0022-Always-build-rk_strlcat-and-rk_strlcpy-symbols.patch	1970-01-01 00:00:00.000000000 +0000
+++ 7.8.git20221117.28daf24+dfsg-4/debian/patches/0022-Always-build-rk_strlcat-and-rk_strlcpy-symbols.patch	2024-01-03 00:43:26.000000000 +0000
@@ -0,0 +1,31 @@
+From: Brian May <bam@debian.org>
+Date: Fri, 22 Dec 2023 11:45:55 +1100
+Subject: Always build rk_strlcat and rk_strlcpy symbols
+
+---
+ cf/roken-frag.m4 | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/cf/roken-frag.m4 b/cf/roken-frag.m4
+index f1f2dbf..a9d1e1d 100644
+--- a/cf/roken-frag.m4
++++ b/cf/roken-frag.m4
+@@ -371,8 +371,6 @@ AC_BROKEN([					\
+ 	strdup					\
+ 	strerror				\
+ 	strftime				\
+-	strlcat					\
+-	strlcpy					\
+ 	strlwr					\
+ 	strncasecmp				\
+ 	strndup					\
+@@ -398,6 +396,9 @@ AC_BROKEN([					\
+ 	writev					\
+ ])
+ 
++rk_LIBOBJ(strlcpy)
++rk_LIBOBJ(strlcat)
++
+ AM_CONDITIONAL(have_fnmatch_h,
+ 	test "$ac_cv_header_fnmatch_h" = yes -a "$ac_cv_func_fnmatch" = yes)
+ 
diff -pruN 7.8.git20221117.28daf24+dfsg-3/debian/patches/series 7.8.git20221117.28daf24+dfsg-4/debian/patches/series
--- 7.8.git20221117.28daf24+dfsg-3/debian/patches/series	2023-07-03 23:43:44.000000000 +0000
+++ 7.8.git20221117.28daf24+dfsg-4/debian/patches/series	2024-01-03 00:29:40.000000000 +0000
@@ -19,3 +19,4 @@ fix-missing-headers
 0019-Increment-hcrypto-library-version.patch
 CVE-2022-45142-gsskrb5-fix-accidental-logic-inversio.patch
 0021-Add-missing-initialization-of-kdc_offset-in-kcm.patch
+0022-Always-build-rk_strlcat-and-rk_strlcpy-symbols.patch