diff --git a/maintainers/docs/todo.txt b/maintainers/docs/todo.txt
index c63a40d85bc..7c4a0150942 100644
--- a/maintainers/docs/todo.txt
+++ b/maintainers/docs/todo.txt
@@ -1,5 +1,3 @@
-* Bump freetype to 2.1.7 (but it breaks Pango 1.2.5).
-
 * Patch development/tools/misc/libtool not to search standard
   directories for libraries (like setup.sh does now). [do we want
   this?]
@@ -10,3 +8,6 @@
 
 * After building gcc, filter out references to /tmp/nix... in
   .../lib/libsupc++.la and .../lib/libstdc++.la
+
+* In libxml2: python2.3 -> python2.4 (or even better, make this
+  generic; also in bittorrent).
diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
index 4db12afb5ce..7de57afc3f8 100644
--- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
@@ -116,6 +116,10 @@ fi
 # Call the real `gcc'.  Filter out warnings from stderr about unused
 # `-B' flags, since they confuse some programs.  Deep bash magic to
 # apply grep to stderr (by swapping stdin/stderr twice).
-(@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \
-    | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-
-exit $?
+if test -z "$NIX_GCC_NEEDS_GREP"; then
+    @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
+else
+    (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \
+        | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-
+    exit $?
+fi    
diff --git a/pkgs/stdenv/freebsd/prehook.sh b/pkgs/stdenv/freebsd/prehook.sh
index 5dcc55fdf07..a82f5d21dfc 100644
--- a/pkgs/stdenv/freebsd/prehook.sh
+++ b/pkgs/stdenv/freebsd/prehook.sh
@@ -1,4 +1,7 @@
 export NIX_ENFORCE_PURITY=
 alias make=gmake
 export MAKE=gmake
-shopt -s expand_aliases
\ No newline at end of file
+shopt -s expand_aliases
+
+# Filter out stupid GCC warnings (in gcc-wrapper).
+export NIX_GCC_NEEDS_GREP=1