diff -Nru whois-5.0.7/debian/changelog whois-5.0.7ubuntu1/debian/changelog
--- whois-5.0.7/debian/changelog	2010-08-08 15:58:23.000000000 -0700
+++ whois-5.0.7ubuntu1/debian/changelog	2010-09-08 15:44:38.000000000 -0700
@@ -1,3 +1,12 @@
+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.7/debian/control whois-5.0.7ubuntu1/debian/control
--- whois-5.0.7/debian/control	2010-07-27 14:13:30.000000000 -0700
+++ whois-5.0.7ubuntu1/debian/control	2010-09-08 15:20:05.000000000 -0700
@@ -1,13 +1,16 @@
 Source: whois
 Section: net
 Priority: standard
-Maintainer: Marco d'Itri <md@linux.it>
+Maintainer: Ubuntu Core 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)