diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index e4a4694404e..b6eec09c13b 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -3,13 +3,13 @@
 
 {stdenv, curl}: # Note that `curl' may be `null', in case of the native stdenv.
 
-{url, outputHash ? "", outputHashAlgo ? "", md5 ? "", sha1 ? "", sha256 ? ""}:
+{name ? "", url, outputHash ? "", outputHashAlgo ? "", md5 ? "", sha1 ? "", sha256 ? ""}:
 
 assert (outputHash != "" && outputHashAlgo != "")
     || md5 != "" || sha1 != "" || sha256 != "";
 
 stdenv.mkDerivation {
-  name = baseNameOf (toString url);
+  name = if name != "" then name else baseNameOf (toString url);
   builder = ./builder.sh;
   buildInputs = [curl];
 
diff --git a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix b/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix
index 906bfe011f0..be8c4febe03 100644
--- a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix
+++ b/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
     # Process Requires.private properly, see
     # http://bugs.freedesktop.org/show_bug.cgi?id=4738.
     (fetchurl {
-      # http://bugs.freedesktop.org/attachment.cgi?id=8494
-      url = http://losser.st-lab.cs.uu.nl/~mbravenb/mirror/pkg-config.patch;
+      name = "pkgconfig-8494.patch";
+      url = http://bugs.freedesktop.org/attachment.cgi?id=8494;
       sha256 = "1pcrdbb7dypg2biy0yqc7bdxak5zii8agqljdvk7j4wbyghpqzws";
     })
   ];