diff -pruN 9.4.1-22/debian/changelog 9.4.1-22ubuntu1/debian/changelog
--- 9.4.1-22/debian/changelog	2023-05-24 12:03:22.000000000 +0000
+++ 9.4.1-22ubuntu1/debian/changelog	2023-05-24 14:38:01.000000000 +0000
@@ -1,3 +1,11 @@
+dhcpcd5 (9.4.1-22ubuntu1) mantic; urgency=medium
+
+  * Drop incompatible ntpd integration. (Closes: #1036092)
+    No longer working after ntpd was replaced by ntpsec.
+  * Remove Conflicts/Replaces dhcp-client (Closes: #1036085)
+
+ -- Shengjing Zhu <shengjing.zhu@canonical.com>  Wed, 24 May 2023 22:38:01 +0800
+
 dhcpcd5 (9.4.1-22) unstable; urgency=medium
 
   [ Martin-Éric Racine ]
diff -pruN 9.4.1-22/debian/control 9.4.1-22ubuntu1/debian/control
--- 9.4.1-22/debian/control	2023-05-24 12:03:22.000000000 +0000
+++ 9.4.1-22ubuntu1/debian/control	2023-05-24 14:38:01.000000000 +0000
@@ -2,7 +2,8 @@ Source: dhcpcd5
 Section: net
 Priority: optional
 Homepage: https://roy.marples.name/projects/dhcpcd
-Maintainer: Martin-Éric Racine <martin-eric.racine@iki.fi>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Martin-Éric Racine <martin-eric.racine@iki.fi>
 Build-Depends: debhelper-compat (= 13),
                libudev-dev [linux-any],
                pkg-config
@@ -13,10 +14,8 @@ Vcs-Git: https://salsa.debian.org/debian
 
 Package: dhcpcd-base
 Architecture: any
-Conflicts: dhcp-client
 Provides: dhcp-client
-Replaces: dhcp-client,
-          dhcpcd5 (<< 9.4.1-2)
+Replaces: dhcpcd5 (<< 9.4.1-2)
 Breaks: dhcpcd5 (<< 9.4.1-2)
 Depends: adduser,
          ${misc:Depends},
diff -pruN 9.4.1-22/debian/hooks/66-ntp.conf 9.4.1-22ubuntu1/debian/hooks/66-ntp.conf
--- 9.4.1-22/debian/hooks/66-ntp.conf	2023-05-24 12:03:22.000000000 +0000
+++ 9.4.1-22ubuntu1/debian/hooks/66-ntp.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-# vi: ft=sh
-
-SERVERFILE_IPV4="/run/ntp.conf.dhcp"
-SERVERFILE_IPV6="$SERVERFILE_IPV4"
-
-add_servers() {
-	# exit early if there's nothing to do
-	if [ "$new_ntp_servers" = "$old_ntp_servers" ]; then
-		return
-	fi
-
-	insert_servers iburst
-	reload_config
-}
-
-remove_servers() {
-	SERVERFILE=$SERVERFILE_IPV4
-
-	# exit early if there's nothing to do
-	if [ ! -f $SERVERFILE ]; then
-		return
-	fi
-
-	withdraw_servers
-	reload_config
-}
-
-reload_config() {
-	invoke-rc.d ntp try-restart || :
-}
-
-if [ -e /etc/ntp.conf ]; then
-	handle_reason
-fi
diff -pruN 9.4.1-22/debian/tests/control 9.4.1-22ubuntu1/debian/tests/control
--- 9.4.1-22/debian/tests/control	2023-05-24 12:03:22.000000000 +0000
+++ 9.4.1-22ubuntu1/debian/tests/control	2023-05-24 14:38:01.000000000 +0000
@@ -13,14 +13,6 @@ Depends: dnsmasq,
          @
 Restrictions: isolation-machine, needs-root, breaks-testbed
 
-Tests: ntpd-ntp-servers-from-dhcp
-Depends: dnsmasq,
-         ethtool,
-         iproute2,
-         ntp,
-         @
-Restrictions: isolation-machine, needs-root, breaks-testbed
-
 Tests: openntpd-ntp-servers-from-dhcp
 Depends: dnsmasq,
          ethtool,
diff -pruN 9.4.1-22/debian/tests/ntpd-ntp-servers-from-dhcp 9.4.1-22ubuntu1/debian/tests/ntpd-ntp-servers-from-dhcp
--- 9.4.1-22/debian/tests/ntpd-ntp-servers-from-dhcp	2023-05-24 12:03:22.000000000 +0000
+++ 9.4.1-22ubuntu1/debian/tests/ntpd-ntp-servers-from-dhcp	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-added_servers_ipv4="/run/ntp.conf.dhcp"
-added_servers_ipv6="$added_servers_ipv4"
-server_list_cmd="ntpq -nwc lpeers"
-
-. debian/tests/common-ntp-servers-from-dhcp
-
-run_test