--- a/debian/control	Wed Jul 01 05:14:05 2009 +0000
+++ b/debian/control	Wed Jul 01 05:14:51 2009 +0000
@@ -1,5 +1,5 @@
 Source: dropbear
-Section: net
+Section: user/network
 Priority: optional
 Maintainer: Matt Johnston <[email protected]>
 Build-Depends: libz-dev
@@ -9,7 +9,9 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: openssh-client, runit
-Conflicts: dropbear-server, dropbear-client, dropbear-common, dropbear-scp
+Section: user/network
+Conflicts: dropbear-server, dropbear-client, dropbear-keyutils, dropbear-scp
+XB-Maemo-Display-Name: Dropbear SSH Client and Server
 Description: lightweight SSH2 server and client
  dropbear is a SSH 2 server and client designed to be small enough to
  be used in small memory environments, while still being functional and
@@ -18,14 +20,19 @@
  It implements most required features of the SSH 2 protocol, and other
  features such as X11 and authentication agent forwarding.
  .
- This packages provides Dropbear client and server as a single binary.
+ This package provides Dropbear client and server as a single binary,
+ as well as key utilities and SCP.
  .
  See http://matt.ucc.asn.au/dropbear/dropbear.html
 
 Package: dropbear-server
 Architecture: any
-Depends: ${shlibs:Depends}, dropbear-common
+Depends: ${shlibs:Depends}
+Section: user/network
+Conflicts: dropbear, dropbear-keyutils
+Provides: dropbear-keyutils
 Recommends: dropbear-scp
+XB-Maemo-Display-Name: Dropbear SSH Server
 Description: lightweight SSH2 server
  dropbear is a SSH 2 server and client designed to be small enough to
  be used in small memory environments, while still being functional and
@@ -34,12 +41,18 @@
  It implements most required features of the SSH 2 protocol, and other
  features such as X11 and authentication agent forwarding.
  .
+ This package provides only the Dropbear server.
+ .
  See http://matt.ucc.asn.au/dropbear/dropbear.html
 
 Package: dropbear-client
 Architecture: any
+Conflicts: dropbear
+Section: user/network
 Depends: ${shlibs:Depends}
-Recommends: dropbear-common, dropbear-scp
+Recommends: dropbear-scp
+Suggests: dropbear-keyutils
+XB-Maemo-Display-Name: Dropbear SSH Client
 Description: lightweight SSH2 client
  dropbear is a SSH 2 server and client designed to be small enough to
  be used in small memory environments, while still being functional and
@@ -48,10 +61,15 @@
  It implements most required features of the SSH 2 protocol, and other
  features such as X11 and authentication agent forwarding.
  .
+ This package provides only the Dropbear client.
+ .
  See http://matt.ucc.asn.au/dropbear/dropbear.html
 
-Package: dropbear-common
+Package: dropbear-keyutils
 Architecture: any
+Conflicts: dropbear, dropbear-server
+Section: user/network
+XB-Maemo-Display-Name: Dropbear SSH Key Utils
 Depends: ${shlibs:Depends}
 Description: lightweight SSH2, key management utilities
  dropbear is a SSH 2 server and client designed to be small enough to
@@ -65,6 +83,9 @@
 
 Package: dropbear-scp
 Architecture: any
+Section: user/network
+Conflicts: dropbear
+XB-Maemo-Display-Name: Dropbear SCP
 Depends: ${shlibs:Depends}
 Description: lightweight SSH2 scp
  dropbear is a SSH 2 server and client designed to be small enough to