diff -Nru whois-5.0.11/debian/changelog whois-5.0.11ubuntu1/debian/changelog
--- whois-5.0.11/debian/changelog	2011-02-03 20:01:13.000000000 +0100
+++ whois-5.0.11ubuntu1/debian/changelog	2011-02-06 13:18:25.000000000 +0100
@@ -1,3 +1,12 @@
+whois (5.0.11ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable. (LP: #714033) Remaining changes:
+    - Add replaces/conflicts as mkpasswd is no longer a separate package.
+      + Note: This needs to be kept until the next LTS release
+        as mkpasswd is a published package in lucid.
+
+ -- Angel Abad <angelabad@ubuntu.com>  Sun, 06 Feb 2011 13:10:00 +0100
+
 whois (5.0.11) unstable; urgency=medium
 
   * Added the remaining IPv4 allocations.
@@ -6,18 +15,48 @@
 
  -- Marco d'Itri <md@linux.it>  Sun, 23 Jan 2011 18:08:55 +0100
 
+whois (5.0.10ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable(LP #692424). Remaining changes:
+    - Add replaces/conflicts as mkpasswd is no longer a separate package.
+      (LP: #632791)
+      + Note: This needs to be kept until the next LTS release
+        as mkpasswd is a published package in lucid.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 20 Dec 2010 10:24:17 +0530
+
 whois (5.0.10) unstable; urgency=medium
 
   * Added new IPv4 allocations.
 
  -- Marco d'Itri <md@linux.it>  Tue, 30 Nov 2010 23:51:59 +0100
 
+whois (5.0.9ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add replaces/conflicts as mkpasswd is no longer a separate package.
+      (LP: #632791):
+      + NOTE: This needs to be kept until the next LTS release
+        as mkpasswd is a published package in lucid.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 29 Nov 2010 09:59:04 -0500
+
 whois (5.0.9) unstable; urgency=low
 
   * Added new IPv4 allocations.
 
  -- Marco d'Itri <md@linux.it>  Sun, 12 Nov 2010 22:24:42 +0100
 
+whois (5.0.8ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #662768), remaining changes:
+    - Add replaces/conflicts as mkpasswd is no longer a separate package.
+      (LP: #632791):
+      + NOTE: This needs to be kept until the next LTS release
+        as mkpasswd is a published package in lucid.
+
+ -- Lorenzo De Liso <blackz@ubuntu.com>  Mon, 18 Oct 2010 17:50:28 +0200
+
 whois (5.0.8) unstable; urgency=medium
 
   * Added the .xn--fzc2c9e2c (.ලංකා, Sri Lanka, Sinhala), .xn--mgbayh7gpa
@@ -29,6 +68,15 @@
 
  -- Marco d'Itri <md@linux.it>  Wed, 06 Oct 2010 17:57:40 +0200
 
+whois (5.0.7ubuntu1) maverick; urgency=low
+
+  * Add replaces/conflicts as mkpasswd is no longer a separate package.
+    (LP: #632791)
+  * NOTE: This needs to be kept until the next LTS release
+    as mkpasswd is a published package in lucid.
+
+ -- Steve Beattie <sbeattie@ubuntu.com>  Tue, 07 Sep 2010 17:24:56 -0700
+
 whois (5.0.7) unstable; urgency=medium
 
   * Added new IPv4 allocations.
diff -Nru whois-5.0.11/debian/control whois-5.0.11ubuntu1/debian/control
--- whois-5.0.11/debian/control	2010-07-27 23:13:30.000000000 +0200
+++ whois-5.0.11ubuntu1/debian/control	2011-02-04 20:06:20.000000000 +0100
@@ -1,13 +1,16 @@
 Source: whois
 Section: net
 Priority: standard
-Maintainer: Marco d'Itri <md@linux.it>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Marco d'Itri <md@linux.it>
 Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 5), gettext, libidn11-dev
 
 Package: whois
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: mkpasswd
+Conflicts: mkpasswd
 Description: an intelligent whois client
  This is a new whois (RFC 3912) client rewritten from scratch.
  It is inspired from and compatible with the usual BSD and RIPE whois(1)