diff -u linux-ftpd-ssl-0.17.18+0.3/debian/control linux-ftpd-ssl-0.17.18+0.3/debian/control
--- linux-ftpd-ssl-0.17.18+0.3/debian/control
+++ linux-ftpd-ssl-0.17.18+0.3/debian/control
@@ -1,13 +1,14 @@
 Source: linux-ftpd-ssl
 Section: net
 Priority: extra
-Maintainer: Cai Qian <caiqian@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Cai Qian <caiqian@debian.org>
 Build-Depends: bison, debhelper (>= 4.0.0), libpam-dev, libssl-dev
-Standards-Version: 3.7.2.1
+Standards-Version: 3.7.3
 
 Package: ftpd-ssl
 Architecture: any
-Depends: netbase, libpam-modules, openssl (>= 0.9.2b), ${shlibs:Depends}, ${misc:Depends}
+Depends: netbase, libpam-modules, openssl (>= 0.9.2b), ${shlibs:Depends}, ${misc:Depends}, update-inetd, openbsd-inetd | inet-superserver
 Provides: ftp-server
 Conflicts: ftp-server, ftpd
 Replaces: ftpd
diff -u linux-ftpd-ssl-0.17.18+0.3/debian/changelog linux-ftpd-ssl-0.17.18+0.3/debian/changelog
--- linux-ftpd-ssl-0.17.18+0.3/debian/changelog
+++ linux-ftpd-ssl-0.17.18+0.3/debian/changelog
@@ -1,3 +1,15 @@
+linux-ftpd-ssl (0.17.18+0.3-9.1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #176175). Remaining Ubuntu changes:
+    - debian/control: Add update-inetd to ftpd-ssl's dependencies
+    - debian/control: Add openbsd-inetd | inet-superserver dependencies
+                      as ftpd-ssl needs an inet server to work
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+  * debian/control: Bump to Standards-Version 3.7.3 
+  * debian/rules: Updated distclean
+
+ -- Pedro Fragoso <emberez@gmail.com>  Thu, 13 Dec 2007 16:50:47 +0000
+
 linux-ftpd-ssl (0.17.18+0.3-9.1) unstable; urgency=high
 
   * Non-maintainer upload by the testing-security team.
diff -u linux-ftpd-ssl-0.17.18+0.3/debian/rules linux-ftpd-ssl-0.17.18+0.3/debian/rules
--- linux-ftpd-ssl-0.17.18+0.3/debian/rules
+++ linux-ftpd-ssl-0.17.18+0.3/debian/rules
@@ -22,7 +22,7 @@
 	dh_testdir
 	dh_testroot
 
-	-$(MAKE) distclean
+	-[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean