diff -pruN 0.17-23/debian/changelog 0.17-23ubuntu1/debian/changelog
--- 0.17-23/debian/changelog	2019-11-11 16:00:30.000000000 +0000
+++ 0.17-23ubuntu1/debian/changelog	2021-02-05 02:33:20.000000000 +0000
@@ -1,3 +1,12 @@
+netkit-tftp (0.17-23ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: Change dependency from openbsd-inetd to xinetd
+      so correct size is reported
+    - debian/control: Added Homepage field.
+
+ -- Logan Rosen <logan@ubuntu.com>  Thu, 04 Feb 2021 21:33:20 -0500
+
 netkit-tftp (0.17-23) unstable; urgency=medium
 
   * Add patch to speed up slow NAKs due to compiler fortification.
@@ -6,6 +15,23 @@ netkit-tftp (0.17-23) unstable; urgency=
 
  -- Alberto Gonzalez Iniesta <agi@inittab.org>  Mon, 11 Nov 2019 17:00:30 +0100
 
+netkit-tftp (0.17-22ubuntu2) eoan; urgency=medium
+
+  * No-change upload with strops.h and sys/strops.h removed in glibc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Sep 2019 11:03:49 +0000
+
+netkit-tftp (0.17-22ubuntu1) eoan; urgency=medium
+
+  * Merge from debian unstable. Remaining changes:
+    - debian/control: Change dependency from openbsd-inetd to xinetd
+      so correct size is reported
+    - debian/control: Added Homepage field.
+  * Dropped changes included in Debian:
+    - tftp/tftp.c: fix FORTIFY-detected potential memory corruption
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 15 May 2019 21:43:43 +0200
+
 netkit-tftp (0.17-22) unstable; urgency=medium
 
   [ Christoph Biedl ]
@@ -48,6 +74,35 @@ netkit-tftp (0.17-19) unstable; urgency=
 
  -- Alberto Gonzalez Iniesta <agi@inittab.org>  Tue, 03 Jul 2018 10:55:34 +0200
 
+netkit-tftp (0.17-18ubuntu3) bionic; urgency=high
+
+  * No change rebuild to pick up -fPIE compiler default
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 03 Apr 2018 12:36:25 +0000
+
+netkit-tftp (0.17-18ubuntu2) natty; urgency=low
+
+  * tftp/tftp.c: fix FORTIFY-detected potential memory corruption
+    (LP: #691345).
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 16 Dec 2010 18:14:49 -0800
+
+netkit-tftp (0.17-18ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #664710). Remaining changes:
+    - debian/control: Change dependency from openbsd-inetd to xinetd
+      so correct size is reported
+    - debian/control: Added Homepage field.
+  * Dropped change: (superceded in debian)
+    - debian/rules: Removed the sed to add -g to CFLAGS. This was not
+      working as currently defined (extra \$), and debug (-g) is not
+      required.
+    - Added debian/watch to monitor for new versions.
+    - Patch to return ENOTFOUND instead of EUNDEF for files that do not
+      exist applied to tftpd/tftpd.c
+
+ -- Angel Abad <angelabad@ubuntu.com>  Fri, 22 Oct 2010 18:16:14 +0200
+
 netkit-tftp (0.17-18) unstable; urgency=low
 
   * debian/control: added ${misc:Depends} to binary packages
@@ -63,6 +118,27 @@ netkit-tftp (0.17-18) unstable; urgency=
 
  -- Alberto Gonzalez Iniesta <agi@inittab.org>  Fri, 24 Sep 2010 18:05:54 +0200
 
+netkit-tftp (0.17-17ubuntu2) maverick; urgency=low
+
+  * debian/control:
+    - Change dependency from openbsd-inetd to xinetd so correct
+      size is reported (LP: #105863) 
+
+ -- Mackenzie Morgan <maco.m@ubuntu.com>  Fri, 20 Aug 2010 12:33:19 -0400
+
+netkit-tftp (0.17-17ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #314084)
+    - debian/control: Added Homepage field.
+    - debian/rules: Removed the sed to add -g to CFLAGS. This was not
+      working as currently defined (extra \$), and debug (-g) is not
+      required.
+    - Added debian/watch to monitor for new versions.
+    - Patch to return ENOTFOUND instead of EUNDEF for files that do not
+      exist applied to tftpd/tftpd.c (Jerry Kotland - LP: #217537)
+
+ -- Stefan Lesicnik <stefan@lsd.co.za>  Mon, 05 Jan 2009 16:37:32 +0200
+
 netkit-tftp (0.17-17) unstable; urgency=low
 
   * Require hostname for connection name (Closes: #375365)
@@ -73,6 +149,24 @@ netkit-tftp (0.17-17) unstable; urgency=
 
  -- Alberto Gonzalez Iniesta <agi@inittab.org>  Tue, 30 Dec 2008 15:03:15 +0100
 
+netkit-tftp (0.17-16ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - No remaining changes.
+  * debian/rules:
+    - Removed the sed to add -g to CFLAGS. This was not working as
+      currently defined (extra \$), and debug (-g) is not required. 
+    - Created if statement to check for the presence of MCONFIG to
+      decide if to run make distclean.
+  * Added debian/watch to monitor for new versions.
+  * debian/control:
+    - Added Homepage field.
+  * Patch to return ENOTFOUND instead of EUNDEF for files that
+    do not exist applied to tftpd/tftpd.c
+    (Jerry Kotland - closes LP: #217537)
+
+ -- Stefan Lesicnik <stefan@lsd.co.za>  Fri, 08 Aug 2008 14:15:39 +0200
+
 netkit-tftp (0.17-16) unstable; urgency=high
 
   * tftpd.c: Fixed security bug that made tftpd serve files from
@@ -93,6 +187,22 @@ netkit-tftp (0.17-16) unstable; urgency=
 
  -- Alberto Gonzalez Iniesta <agi@inittab.org>  Tue, 05 Aug 2008 13:15:15 +0200
 
+netkit-tftp (0.17-15ubuntu2) intrepid; urgency=low
+
+  * debian/control:
+    - Update Maintainer field as per spec (LP: #230350).
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Wed, 04 Jun 2008 23:26:06 +0200
+
+netkit-tftp (0.17-15ubuntu1) feisty; urgency=low
+
+  * debian/control: Add update-inetd to tftpd's dependencies
+    (Closes Ubuntu: #76160).
+  * debian/control: Add openbsd-inetd | inet-superserver dependencies
+    as tftpd needs an inet server to work
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Sun, 17 Dec 2006 16:08:24 +0100
+
 netkit-tftp (0.17-15) unstable; urgency=low
 
   * tftpd/tftpd.c: Fixed file mode when new files are uploaded.
diff -pruN 0.17-23/debian/control 0.17-23ubuntu1/debian/control
--- 0.17-23/debian/control	2018-12-13 19:43:29.000000000 +0000
+++ 0.17-23ubuntu1/debian/control	2019-11-11 21:51:46.000000000 +0000
@@ -1,8 +1,10 @@
 Source: netkit-tftp
 Section: net
 Priority: optional
-Maintainer: Alberto Gonzalez Iniesta <agi@inittab.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Alberto Gonzalez Iniesta <agi@inittab.org>
 Standards-Version: 4.2.1
+Homepage: http://www.hcs.harvard.edu/~dholland/computers/netkit.html
 Build-Depends: debhelper (>= 11), cmake
 
 Package: tftp
@@ -17,7 +19,7 @@ Description: Trivial file transfer proto
 
 Package: tftpd
 Architecture: any
-Depends: openbsd-inetd | inet-superserver, ${shlibs:Depends}, ${misc:Depends}
+Depends: xinetd | inet-superserver, ${shlibs:Depends}, ${misc:Depends}
 Replaces: netstd
 Description: Trivial file transfer protocol server
  Tftpd is a server which supports the Internet Trivial File Transfer Protocol
