diff -Nru krb5-1.20.1/debian/changelog krb5-1.20.1/debian/changelog
--- krb5-1.20.1/debian/changelog	2023-08-14 20:06:53.000000000 +0000
+++ krb5-1.20.1/debian/changelog	2023-08-24 18:07:33.000000000 +0000
@@ -1,3 +1,12 @@
+krb5 (1.20.1-3ubuntu1) mantic; urgency=medium
+
+  * Make krb5int_strl(cat|copy) optional symbols, since they are not needed
+    when built against glibc 2.38.  Closes: #1043184.
+  * Declare Breaks: against older packages using these symbols.
+  * Make dependencies on libkrb5support0 strict to avoid future symbol skew.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 24 Aug 2023 18:07:33 +0000
+
 krb5 (1.20.1-3) unstable; urgency=high
 
   * Fixes CVE-2023-36054: a  remote authenticated attacker can cause
diff -Nru krb5-1.20.1/debian/control krb5-1.20.1/debian/control
--- krb5-1.20.1/debian/control	2023-08-14 20:01:40.000000000 +0000
+++ krb5-1.20.1/debian/control	2023-08-24 18:07:33.000000000 +0000
@@ -8,7 +8,8 @@
  libverto-dev (>= 0.2.4), pkg-config
 Build-Depends-Indep: python3, python3-cheetah, python3-lxml, python3-sphinx, doxygen, doxygen-latex, tex-gyre
 Standards-Version: 4.6.1
-Maintainer: Sam Hartman <hartmans@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sam Hartman <hartmans@debian.org>
 Uploaders: Russ Allbery <rra@debian.org>, Benjamin Kaduk <kaduk@mit.edu>
 Homepage: https://web.mit.edu/kerberos/
 Vcs-Git: https://salsa.debian.org/debian/krb5
@@ -392,7 +393,11 @@
 Section: libs
 Breaks: libgssapi-krb5-2 (<< 1.20),
  libkadm5srv-mit9 (<< 1.13~alpha1-1), libkadm5clnt-mit9 (<< 1.13~alpha1-1),
- libk5crypto3 (<< 1.20),  libkdb5-8 (<< 1.16)
+ libk5crypto3 (<< 1.20.1-3ubuntu1~),  libkdb5-8 (<< 1.16),
+ krb5-pkinit (<< 1.20.1-3ubuntu1~), libkrb5-3 (<< 1.20.1-3ubuntu1~),
+ libkadm5srv-mit12 (<< 1.20.1-3ubuntu1~), libkdb5-10 (<< 1.20.1-3ubuntu1~),
+ krb5-admin-server (<< 1.20.1-3ubuntu1~), krb5-kdc (<< 1.20.1-3ubuntu1~),
+ krb5-user (<< 1.20.1-3ubuntu1~)
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Multi-Arch: same
diff -Nru krb5-1.20.1/debian/libkrb5support0.lintian-overrides krb5-1.20.1/debian/libkrb5support0.lintian-overrides
--- krb5-1.20.1/debian/libkrb5support0.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ krb5-1.20.1/debian/libkrb5support0.lintian-overrides	2023-08-24 17:58:07.000000000 +0000
@@ -0,0 +1 @@
+libkrb5support0: symbols-declares-dependency-on-other-package libkrb5support0 (= ${binary:Version}) (libkrb5support.so.0) [symbols]
diff -Nru krb5-1.20.1/debian/libkrb5support0.symbols krb5-1.20.1/debian/libkrb5support0.symbols
--- krb5-1.20.1/debian/libkrb5support0.symbols	2023-08-14 20:01:40.000000000 +0000
+++ krb5-1.20.1/debian/libkrb5support0.symbols	2023-08-24 17:44:25.000000000 +0000
@@ -1,4 +1,4 @@
-libkrb5support.so.0 libkrb5support0 #MINVER#
+libkrb5support.so.0 libkrb5support0 (= ${binary:Version})
  HIDDEN@HIDDEN 1.7dfsg~beta2
  k5_base64_decode@krb5support_0_MIT 1.12~alpha1+dfsg
  k5_base64_encode@krb5support_0_MIT 1.12~alpha1+dfsg
@@ -93,8 +93,8 @@
  krb5int_open_plugin_dirs@krb5support_0_MIT 1.7dfsg~beta2
  krb5int_pthread_loaded@krb5support_0_MIT 1.7dfsg~beta2
  krb5int_setspecific@krb5support_0_MIT 1.7dfsg~beta2
- krb5int_strlcat@krb5support_0_MIT 1.7dfsg~beta2
- krb5int_strlcpy@krb5support_0_MIT 1.7dfsg~beta2
+ (optional)krb5int_strlcat@krb5support_0_MIT 1.7dfsg~beta2
+ (optional)krb5int_strlcpy@krb5support_0_MIT 1.7dfsg~beta2
  krb5int_ucs4_to_utf8@krb5support_0_MIT 1.7dfsg~beta2
  krb5int_utf8_lentab@krb5support_0_MIT 1.7dfsg~beta2
  krb5int_utf8_mintab@krb5support_0_MIT 1.7dfsg~beta2