diff -u netkit-telnet-0.17/debian/control netkit-telnet-0.17/debian/control
--- netkit-telnet-0.17/debian/control
+++ netkit-telnet-0.17/debian/control
@@ -17,7 +17,7 @@
 Package: telnetd
 Architecture: any
 Priority: optional
-Depends: adduser, openbsd-inetd | inet-superserver, passwd, ${shlibs:Depends}
+Depends: adduser, openbsd-inetd | inet-superserver, passwd, update-inetd, ${shlibs:Depends}
 Replaces: netstd
 Provides: telnet-server
 Conflicts: suidmanager (<< 0.50)
diff -u netkit-telnet-0.17/debian/changelog netkit-telnet-0.17/debian/changelog
--- netkit-telnet-0.17/debian/changelog
+++ netkit-telnet-0.17/debian/changelog
@@ -1,3 +1,10 @@
+netkit-telnet (0.17-36ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #314118
+    - debian/control: Add update-inetd to telnetd's dependencies
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Mon, 05 Jan 2009 22:54:23 +0530
+
 netkit-telnet (0.17-36) unstable; urgency=low
 
   [ Ian Beckwith ]
@@ -21,6 +28,15 @@
 
  -- Alberto Gonzalez Iniesta <agi@inittab.org>  Tue, 22 Jul 2008 17:38:26 +0200
 
+netkit-telnet (0.17-35ubuntu1) feisty; urgency=low
+
+  * debian/control: Add update-inetd to telnetd's dependencies
+    (Closes Ubuntu: #76159).
+  * debian/control: Add openbsd-inetd | inet-superserver dependencies
+    as telnetd needs an inet server to work
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Sun, 17 Dec 2006 15:57:51 +0100
+
 netkit-telnet (0.17-35) unstable; urgency=low
 
   * The 'this does not need to depend on update-inetd' release