diff --git a/dhcp/.footprint b/dhcp/.footprint
index 583152d7d..ee1cf9f59 100644
--- a/dhcp/.footprint
+++ b/dhcp/.footprint
@@ -10,25 +10,16 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/dhcpctl/
 -rw-r--r--	root/root	usr/include/dhcpctl/dhcpctl.h
 drwxr-xr-x	root/root	usr/include/isc-dhcp/
--rw-r--r--	root/root	usr/include/isc-dhcp/boolean.h
--rw-r--r--	root/root	usr/include/isc-dhcp/commandline.h
 -rw-r--r--	root/root	usr/include/isc-dhcp/dst.h
--rw-r--r--	root/root	usr/include/isc-dhcp/formatcheck.h
--rw-r--r--	root/root	usr/include/isc-dhcp/int.h
--rw-r--r--	root/root	usr/include/isc-dhcp/lang.h
--rw-r--r--	root/root	usr/include/isc-dhcp/list.h
--rw-r--r--	root/root	usr/include/isc-dhcp/mem.h
--rw-r--r--	root/root	usr/include/isc-dhcp/print.h
--rw-r--r--	root/root	usr/include/isc-dhcp/result.h
--rw-r--r--	root/root	usr/include/isc-dhcp/string.h
--rw-r--r--	root/root	usr/include/isc-dhcp/types.h
 drwxr-xr-x	root/root	usr/include/omapip/
 -rw-r--r--	root/root	usr/include/omapip/alloc.h
 -rw-r--r--	root/root	usr/include/omapip/buffer.h
 -rw-r--r--	root/root	usr/include/omapip/convert.h
 -rw-r--r--	root/root	usr/include/omapip/hash.h
+-rw-r--r--	root/root	usr/include/omapip/isclib.h
 -rw-r--r--	root/root	usr/include/omapip/omapip.h
 -rw-r--r--	root/root	usr/include/omapip/omapip_p.h
+-rw-r--r--	root/root	usr/include/omapip/result.h
 -rw-r--r--	root/root	usr/include/omapip/trace.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libdhcpctl.a
diff --git a/dhcp/.md5sum b/dhcp/.md5sum
index 143e8368b..449ca51f2 100644
--- a/dhcp/.md5sum
+++ b/dhcp/.md5sum
@@ -1,3 +1,3 @@
-efc3dbabdb2e1127fddc590922ec46b6  default-config.diff
-38a74c89d8913b9b5f33737047623c18  dhcp-4.1.1.tar.gz
+456711bbb2c8fc8b6e0df7c9a514c237  default-config.diff
+83abd7c4f9c24d8dd024ca5a71380c0a  dhcp-4.2.0.tar.gz
 51665125f8360c6cc1ef59ad6cd8cf84  dhcpd
diff --git a/dhcp/Pkgfile b/dhcp/Pkgfile
index 553a74dc3..e86d8423d 100644
--- a/dhcp/Pkgfile
+++ b/dhcp/Pkgfile
@@ -6,7 +6,7 @@
 # Depends on: 
 
 name=dhcp
-version=4.1.1
+version=4.2.0
 release=1
 source=(http://ftp.isc.org/isc/$name/$name-$version.tar.gz
       dhcpd
@@ -14,6 +14,7 @@ source=(http://ftp.isc.org/isc/$name/$name-$version.tar.gz
 
 build() {
   cd dhcp-$version
+  cat server/dhcpd.conf
   patch -p1 -i $SRC/default-config.diff
 
   ./configure --prefix=/usr \
diff --git a/dhcp/default-config.diff b/dhcp/default-config.diff
index a9421620f..192bb5306 100644
--- a/dhcp/default-config.diff
+++ b/dhcp/default-config.diff
@@ -6,7 +6,7 @@ diff -ur dhcp-4.0.0.orig/client/dhclient.conf dhcp-4.0.0/client/dhclient.conf
 +# /etc/dhclient.conf: DHCP client configuration file, see dhclient.conf(5)
 +#
 +
- send host-name "andare.fugue.com";
+ send host-name = pick-first-value(gethostname(), "ISC-dhclient");
  send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
  send dhcp-lease-time 3600;
 @@ -11,7 +15,7 @@