diff -u leafnode-1.11.6/debian/changelog leafnode-1.11.6/debian/changelog
--- leafnode-1.11.6/debian/changelog
+++ leafnode-1.11.6/debian/changelog
@@ -1,3 +1,11 @@
+leafnode (1.11.6-2ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+       - Depends on netkit-inetd and update-inetd
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Kjell Braden <fnord@pentabarf.de>  Tue,  8 May 2007 16:05:48 +0200
+
 leafnode (1.11.6-2) unstable; urgency=low
 
   * Add Dutch translation of the debconf templates, kindly provided by Bart
@@ -12,12 +20,33 @@
 
  -- Mark Brown <broonie@debian.org>  Sat, 31 Mar 2007 17:49:13 +0100
 
+leafnode (1.11.5-5ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable. Ubuntu changes:
+     - Depends on netkit-inetd and update-inetd
+
+ -- Adrien Cunin <adri2000@gmail.com>  Sun, 14 Jan 2007 21:13:47 +0100
+
 leafnode (1.11.5-5) unstable; urgency=low
 
   * Updated German debconf translation from Jonas E. Huber <jonas@hubjo.org>.
 
  -- Mark Brown <broonie@debian.org>  Thu, 11 Jan 2007 19:07:09 +0000
 
+leafnode (1.11.5-4ubuntu2) feisty; urgency=low
+
+  * debian/control: Add update-inetd to leafnode's dependencies
+    (Closes Ubuntu: #76107).
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Sun, 17 Dec 2006 11:49:06 +0100
+
+leafnode (1.11.5-4ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable.
+  * Keep Ubuntu changes 
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Thu, 23 Nov 2006 18:03:43 +1100
+
 leafnode (1.11.5-4) unstable; urgency=low
 
   * Add logcheck rules for texpire and workarounds for silly paranoia rules
@@ -36,6 +65,12 @@
 
  -- Mark Brown <broonie@debian.org>  Wed, 20 Sep 2006 22:53:12 +0100
 
+leafnode (1.11.5-2ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sun, 30 Jul 2006 00:54:10 -0500
+
 leafnode (1.11.5-2) unstable; urgency=low
 
   * Add Russian translation of the Debconf templates, kindly provided by
@@ -50,6 +85,13 @@
 
  -- Mark Brown <broonie@debian.org>  Wed, 19 Apr 2006 18:04:23 +0100
 
+leafnode (1.11.4-2ubuntu1) dapper; urgency=low
+
+  * debian/control
+   + Added netkit-inetd. (Closes: Malone #41236)
+
+ -- Chuck Short <zulcss@gmail.com>  Tue, 25 Apr 2006 18:52:41 -0400
+
 leafnode (1.11.4-1) unstable; urgency=low
 
   * New upstream release.
diff -u leafnode-1.11.6/debian/control leafnode-1.11.6/debian/control
--- leafnode-1.11.6/debian/control
+++ leafnode-1.11.6/debian/control
@@ -1,7 +1,8 @@
 Source: leafnode
 Section: news
 Priority: extra
-Maintainer: Mark Brown <broonie@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Mark Brown <broonie@debian.org>
 Standards-Version: 3.6.2
 Build-Depends: libpcre3-dev, debhelper (>= 4.1.68)
 
@@ -9,7 +10,7 @@
 Architecture: any
 Provides: news-transport-system
 Conflicts: news-transport-system, newsx
-Depends: netbase, tcpd, logrotate, debconf (>= 0.5) | debconf-2.0, ${shlibs:Depends}
+Depends: netbase, tcpd, logrotate, debconf (>= 0.5) | debconf-2.0, ${shlibs:Depends}, netkit-inetd, update-inetd
 Suggests: slrn | news-reader, perl5, libnet-perl
 Description: NNTP server for small leaf sites
  Leafnode is a news server suitable for small, limited-bandwidth sites