diff --git a/debian/control b/debian/control
index faa446b4..5d7814fc 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,9 @@ Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, screen, gettext-base,
 Recommends: update-notifier-common, lsb-release
 Suggests: byobu-extras
 Enhances: screen
+Provides: screen-profiles
+Replaces: screen-profiles
+Conflicts: screen-profiles
 Description: a set of useful profiles and a profile-switcher for GNU screen
  byobu includes a set of profiles for the GNU screen window manager.
  These profiles are quite useful on server machines which are not running
@@ -28,19 +31,10 @@ Description: a set of useful profiles and a profile-switcher for GNU screen
 Package: byobu-extras
 Architecture: all
 Depends: ${misc:Depends}, byobu
+Provides: screen-profiles-extras
+Replaces: screen-profiles-extras
+Conflicts: screen-profiles-extras
 Description: additional colored profiles for the byobu package
- The byobu contains a basic set of light and dark profiles.
+ The byobu contains a basic set of light and dark screen profiles.
  The byobu-extras package provides additional profiles of various
  different light and dark colors.
-
-Package: screen-profiles
-Architecture: all
-Depends: ${misc:Depends}, byobu
-Description: package has been renamed to byobu
- The screen-profiles package has been renamed to 'byobu'.
-
-Package: screen-profiles-extras
-Architecture: all
-Depends: ${misc:Depends}, byobu-extras
-Description: package has been renamed to byobu-extras
- The screen-profiles-extras package has been renamed to 'byobu-extras'.
diff --git a/debian/install b/debian/install
index b5746702..d3e705f6 100644
--- a/debian/install
+++ b/debian/install
@@ -9,6 +9,7 @@ keybindings/common usr/share/byobu/keybindings
 keybindings/none usr/share/byobu/keybindings
 windows/common usr/share/byobu/windows
 select-screen-profile usr/bin
+byobu usr/bin
 byobu-config usr/bin
 byobu-status usr/bin
 byobu-status-detail usr/bin
@@ -17,3 +18,4 @@ screen-launcher-uninstall usr/share/byobu
 motd+shell usr/bin
 screen-launcher usr/bin
 byobu-export usr/bin
+debian/lintian/byobu usr/share/lintian/overrides
diff --git a/debian/lintian/byobu b/debian/lintian/byobu
new file mode 100644
index 00000000..d2cf1e41
--- /dev/null
+++ b/debian/lintian/byobu
@@ -0,0 +1,2 @@
+byobu: binary-without-manpage
+# The manpages are, of course, part of the original screen package.
diff --git a/debian/preinst b/debian/preinst
index 2962c268..521673ba 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -2,7 +2,7 @@
 
 PKG="byobu"
 
-if [ "install" = "$1" ] || [ "upgrade" = "$1" ]; then
+if [ "$1" = install -o "$1" = upgrade ]; then
 	dpkg-divert --package "$PKG" --divert /usr/bin/screen.real --rename /usr/bin/screen
 fi
 
diff --git a/debian/rules b/debian/rules
index 12e79490..2014cacc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,8 +48,8 @@ install: build install-po
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_install -X.bzr
 	dh_link usr/bin/byobu usr/bin/screen
+	dh_install -X.bzr
 
 # Everything else is handled by dh_install
 
@@ -58,7 +58,7 @@ binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdocs -X.bzr -i
-	dh_installman -i screen-launcher.1 byobu-config.1 select-screen-profile.1 motd+shell.1 byobu-export.1 byobu-status.1 byobu-status-detail.1
+	dh_installman -i screen-launcher.1 byobu.1 byobu-config.1 select-screen-profile.1 motd+shell.1 byobu-export.1 byobu-status.1 byobu-status-detail.1
 	dh_installchangelogs -i
 	dh_installdebconf -i
 	dh_compress -i