diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 7d7b290a5be..eab6a421544 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -168,6 +168,11 @@ rec {
     inherit fetchurl stdenv groff;
   };
 
+  dhcpWrapper = (import ../tools/networking/dhcp-wrapper) {
+    inherit stdenv dhcp;
+  };
+
+
   graphviz = (import ../tools/graphics/graphviz) {
     inherit fetchurl stdenv libpng libjpeg expat x11 yacc libtool;
     inherit (xlibs) libXaw;
diff --git a/pkgs/tools/networking/dhcp-wrapper/builder.sh b/pkgs/tools/networking/dhcp-wrapper/builder.sh
new file mode 100644
index 00000000000..037453a1882
--- /dev/null
+++ b/pkgs/tools/networking/dhcp-wrapper/builder.sh
@@ -0,0 +1,5 @@
+. $stdenv/setup
+. $makeWrapper
+
+makeWrapper "$dhcp/sbin/dhclient" "$out/sbin/dhclient" \
+--set PATH_DHCLIENT_SCRIPT "$dhcp/sbin/dhclient-script"
diff --git a/pkgs/tools/networking/dhcp-wrapper/default.nix b/pkgs/tools/networking/dhcp-wrapper/default.nix
new file mode 100644
index 00000000000..e4b5695cf67
--- /dev/null
+++ b/pkgs/tools/networking/dhcp-wrapper/default.nix
@@ -0,0 +1,10 @@
+{stdenv, dhcp}:
+
+stdenv.mkDerivation {
+  name = dhcp.name;
+
+  builder = ./builder.sh;
+  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
+
+  inherit dhcp;
+}