diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index e278980e1e1..6145c8c4947 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
+{ stdenv, fetchurl, pkgconfig, glib, gssdp, libsoup, libxml2, libuuid }:
  
 stdenv.mkDerivation rec {
   name = "gupnp-${version}";
   majorVersion = "0.20";
-  version = "${majorVersion}.9";
+  version = "${majorVersion}.14";
+
   src = fetchurl {
     url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
-    sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1";
+    sha256 = "77ffb940ba77c4a6426d09d41004c75d92652dcbde86c84ac1c847dbd9ad59bd";
   };
 
-  propagatedBuildInputs = [ libxml2 libsoup gssdp ];
-  buildInputs = [ glib libuuid ];
-
   nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ];
 
-  postInstall = '' 
-    cp -r ${libsoup}/include/libsoup-2.4/libsoup $out/include
-    cp -r ${gssdp}/include/gssdp-1.0/libgssdp $out/include
-    cp -r ${libxml2}/include/libxml2/libxml $out/include
-    '';
+  postInstall = ''
+    ln -sv ${libsoup}/include/*/libsoup $out/include
+    ln -sv ${libxml2}/include/*/libxml $out/include
+    ln -sv ${gssdp}/include/*/libgssdp $out/include
+  '';
 
   meta = {
     homepage = http://www.gupnp.org/;