diff --git a/ChangeLog b/ChangeLog
index 41075148b..66442489a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-13  Neil Roberts  <neil@o-hand.com>
+
+	* build/mingw/mingw-cross-compile.sh: Avoid using the --strip
+	option to tar because it isn't supported in the version shipped
+	with MSYS.
+
 2008-07-11  Tomas Frydrych  <tf@openedhand.com>
 
 	* clutter/clutter-fixed.c:
diff --git a/build/mingw/mingw-cross-compile.sh b/build/mingw/mingw-cross-compile.sh
index 1a922a1cf..bfde70688 100755
--- a/build/mingw/mingw-cross-compile.sh
+++ b/build/mingw/mingw-cross-compile.sh
@@ -307,12 +307,13 @@ sed -e 's/^Cflags:.*$/Cflags: -I${includedir}\/pango-1.0 -I${includedir}\/freety
 mv "$ROOT_DIR/lib/pkgconfig/pangoft2.pc"{.tmp,};
 
 echo "Extracting Mesa headers...";
-if ! tar -C "$ROOT_DIR" \
+if ! tar -C "$DOWNLOAD_DIR" \
     -jxf "$DOWNLOAD_DIR/MesaLib-7.0.3.tar.bz2" \
-    --strip 1 Mesa-7.0.3/include; then
+    Mesa-7.0.3/include; then
     echo "Failed to extract Mesa headers";
     exit 1;
 fi;
+cp -R "$DOWNLOAD_DIR/Mesa-7.0.3/include/"* "$ROOT_DIR/include";
 
 ##
 # Build