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
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