diff -Nru zutils-1.13/debian/changelog zutils-1.13/debian/changelog
--- zutils-1.13/debian/changelog	2024-01-31 05:36:17.000000000 +0000
+++ zutils-1.13/debian/changelog	2024-02-22 11:26:40.000000000 +0000
@@ -1,3 +1,10 @@
+zutils (1.13-1ubuntu1) noble; urgency=medium
+
+  [ Helmut Grohne ]
+  * DEP17 M18: Duplicate aliased diversions (Closes: #1059534).
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 22 Feb 2024 12:26:40 +0100
+
 zutils (1.13-1) sid; urgency=medium
 
   * Uploading to sid.
diff -Nru zutils-1.13/debian/control zutils-1.13/debian/control
--- zutils-1.13/debian/control	2024-01-31 05:35:58.000000000 +0000
+++ zutils-1.13/debian/control	2024-02-22 11:26:40.000000000 +0000
@@ -1,7 +1,8 @@
 Source: zutils
 Section: utils
 Priority: optional
-Maintainer: Daniel Baumann <daniel.baumann@progress-linux.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Daniel Baumann <daniel.baumann@progress-linux.org>
 Build-Depends:
  debhelper-compat (= 13),
  lzip,
diff -Nru zutils-1.13/debian/rules zutils-1.13/debian/rules
--- zutils-1.13/debian/rules	2024-01-31 05:35:58.000000000 +0000
+++ zutils-1.13/debian/rules	2024-02-22 11:26:40.000000000 +0000
@@ -6,7 +6,7 @@
 	dh ${@}
 
 override_dh_auto_configure:
-	dh_auto_configure -- --exec-prefix=/ CXX=$(CXX)
+	dh_auto_configure -- CXX=$(CXX)
 
 override_dh_auto_install:
 	dh_auto_install -- DESTDIR=$(CURDIR)/debian/zutils
diff -Nru zutils-1.13/debian/zutils.postrm zutils-1.13/debian/zutils.postrm
--- zutils-1.13/debian/zutils.postrm	2024-01-31 05:35:58.000000000 +0000
+++ zutils-1.13/debian/zutils.postrm	2024-02-22 11:26:40.000000000 +0000
@@ -6,7 +6,8 @@
 	remove)
 		for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
 		do
-			dpkg-divert --package zutils --quiet --remove --rename --divert /bin/${FILE}.gzip /bin/${FILE}
+			dpkg-divert --package zutils --quiet --remove --rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
+			dpkg-divert --package zutils --quiet --remove --rename --divert "/bin/$FILE.gzip.usr-is-merged" "/bin/$FILE"
 			dpkg-divert --package zutils --quiet --remove --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
 		done
 		;;
diff -Nru zutils-1.13/debian/zutils.preinst zutils-1.13/debian/zutils.preinst
--- zutils-1.13/debian/zutils.preinst	2024-01-31 05:35:58.000000000 +0000
+++ zutils-1.13/debian/zutils.preinst	2024-02-22 11:26:40.000000000 +0000
@@ -2,16 +2,42 @@
 
 set -e
 
+# DEP17 M18: Duplicate diversion in aliased location /bin.
+
 case "${1}" in
 	install)
 		for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
 		do
-			dpkg-divert --package zutils --quiet --add --rename --divert /bin/${FILE}.gzip /bin/${FILE}
+			dpkg-divert --package zutils --quiet --add --rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
+			dpkg-divert --package zutils --quiet --add --rename --divert "/bin/$FILE.gzip.usr-is-merged" "/bin/$FILE"
 			dpkg-divert --package zutils --quiet --add --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
 		done
 		;;
 
-	abort-upgrade|upgrade)
+	upgrade)
+		for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
+		do
+			TRUENAME=$(dpkg-divert --truename "/usr/bin/$FILE")
+			if test "$TRUENAME" = "/usr/bin/$FILE.usr-is-merged"; then
+				# gzip.preinst duplicated the diversion for us
+				dpkg-divert --package zutils --quiet --remove --no-rename --divert "/usr/bin/$FILE.usr-is-merged" "/usr/bin/$FILE"
+				dpkg-divert --package zutils --quiet --remove --no-rename "/bin/$FILE"
+				dpkg-divert --package zutils --quiet --add --no-rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
+				dpkg-divert --package zutils --quiet --add --no-rename --divert "/bin/$TOOL.gzip.usr-is-merged" "/bin/$TOOL"
+			elif test "$TRUENAME" != "/usr/bin/$FILE.gzip"; then
+				dpkg-divert --package zutils --quiet --add --no-rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
+				TRUENAME=$(dpkg-divert --truename "/bin/$FILE")
+				if test "$TRUENAME" != "/bin/$FILE.gzip.usr-is-merged"; then
+					dpkg-divert --package zutils --quiet --remove --no-rename "/bin/$FILE"
+					dpkg-divert --package zutils --quiet --add --no-rename --divert "/bin/$FILE.gzip.usr-is-merged" "/bin/$FILE"
+					if test -e "$DPKG_ROOT$TRUENAME" -o -h "$DPKG_ROOT$TRUENAME"; then
+						mv "$DPKG_ROOT$TRUENAME" "$DPKG_ROOT/bin/$FILE.gzip.usr-is-merged"
+					fi
+				fi
+			fi
+		done
+		;;
+	abort-upgrade)
 
 		;;