diff --git a/maintainers/docs/todo.txt b/maintainers/docs/todo.txt
index 138d1962686e..79432c85d142 100644
--- a/maintainers/docs/todo.txt
+++ b/maintainers/docs/todo.txt
@@ -13,4 +13,8 @@
   seem to like Glibc `libintl.h'; needs the gettext one instead.
   [Move from libbonoboui]
 
-* Fix the bzip2 build generically.
\ No newline at end of file
+* Fix the bzip2 build generically.
+
+* In stdenv/setup.sh: put the call to patchelf etc. in a separate
+  phase (fixupPhase?) that comes after the installPhase.  This is so
+  that when one overrides installPhase, the fixup stuff is still done.
diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index 00b3ecb73e80..19514ac86675 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -2,7 +2,8 @@ source $stdenv/setup
 
 header "downloading $out from $url"
 
-curl --fail --location --max-redirs 20 --disable-epsv "$url" > "$out"
+curl --fail --location --max-redirs 20 --disable-epsv \
+    --cookie-jar cookies "$url" > "$out"
 
 if test "$NIX_OUTPUT_CHECKED" != "1"; then
     if test "$outputHashAlgo" != "md5"; then