diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index dc7cc963d27..bc2e28f03a3 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -86,6 +86,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  groff = (import ../tools/text/groff) {
+    inherit fetchurl stdenv;
+  };
+
   enscript = (import ../tools/text/enscript) {
     inherit fetchurl stdenv;
   };
@@ -160,6 +164,10 @@ rec {
     inherit fetchurl stdenv python pygtk makeWrapper;
   };
 
+  dhcp = (import ../tools/networking/dhcp) {
+    inherit fetchurl stdenv;
+  };
+
   graphviz = (import ../tools/graphics/graphviz) {
     inherit fetchurl stdenv libpng libjpeg expat x11 yacc libtool;
     inherit (xlibs) libXaw;
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
new file mode 100644
index 00000000000..426426bc64e
--- /dev/null
+++ b/pkgs/tools/text/groff/default.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "groff-1.19.1";
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/gnu/groff/groff-1.19.1.tar.gz;
+    md5 = "57d155378640c12a80642664dfdfc892";
+  };
+}