diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
new file mode 100644
index 000000000000..8346be2ceb57
--- /dev/null
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -0,0 +1,11 @@
+{fetchurl, stdenv, gupnp, gssdp, pkgconfig, glib, libxml2, libsoup, gtk, libglade, gnomeicontheme, e2fsprogs}:
+
+stdenv.mkDerivation rec {
+  name = "gupnp-tools-0.6";
+  src = fetchurl {
+    url = "http://www.gupnp.org/sources/gupnp-tools/gupnp-tools-0.6.tar.gz";
+    sha256 = "08fnggk85zqdcvm4np53yxw15b3ck25c2rmyfrh04g8j25qf50dj";
+  };
+
+  buildInputs = [gupnp gssdp pkgconfig glib libxml2 libsoup gtk libglade gnomeicontheme e2fsprogs];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ee3e803e1c7..89ff3f7fc444 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -691,6 +691,12 @@ let pkgs = rec {
       inherit (gnome) libsoup;
     };
 
+  gupnptools = import ../tools/networking/gupnp-tools {
+      inherit fetchurl stdenv gssdp gupnp pkgconfig libxml2 e2fsprogs;
+      inherit (gtkLibs) gtk glib;
+      inherit (gnome) libsoup libglade gnomeicontheme;
+  };
+
   gzip = useFromStdenv "gzip"
     (import ../tools/compression/gzip {
       inherit fetchurl stdenv;