diff --git a/TODO b/TODO
index 8cf514d1..32e71a69 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,3 @@
-* Nameserver and domain are in the common configuration?  Should they be? 
-
-* we should send a dhcp hostname
-
 * put in checks so the user can't enter data that is clearly invalid (perhaps
   this will be done through debconf.
 
@@ -13,5 +9,4 @@
 * Make netcfg-static smarter about default values, e.g. call ifconfig and
   parse.
 
-* Group as many questions together as possible (see #186029). Is the "Is this
-  correct" question really necessary? Backup support is probably better!
+* Ask for a hostname if the DHCP server does not provide one.
diff --git a/debian/changelog b/debian/changelog
index 983039ca..80b7bc0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ netcfg (0.37) UNRELEASED; urgency=low
 
   * Thiemo Seufer
     - Code cleanup.
+  * Gaudenz Steinlin
+    - prefer udhcpc to pump
 
- -- Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>  Mon, 22 Dec 2003 23:38:05 +0100
+ -- Gaudenz Steinlin <gaudenz@soziologie.ch>  Tue, 23 Dec 2003 13:51:10 +0100
 
 netcfg (0.36) unstable; urgency=low
 
diff --git a/netcfg-common.c b/netcfg-common.c
index 25a98319..189f0779 100644
--- a/netcfg-common.c
+++ b/netcfg-common.c
@@ -896,10 +896,10 @@ int netcfg_activate_dhcp(struct debconfclient *client)
 
     if (stat("/sbin/dhclient", &stat_buf) == 0)
         dhcp_client = DHCLIENT;
-    else if (stat("/sbin/pump", &stat_buf) == 0)
-        dhcp_client = PUMP;
     else if (stat("/sbin/udhcpc", &stat_buf) == 0)
         dhcp_client = UDHCPC;
+    else if (stat("/sbin/pump", &stat_buf) == 0)
+        dhcp_client = PUMP;
     else {
         debconf_input(client, "critical", "netcfg/no_dhcp_client");
         debconf_go(client);