diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 79b69fabfaea..ee4cf8355f4c 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -83,7 +83,7 @@ rec {
     if system == "i686-linux" then stdenvLinux
     else if system == "i686-freebsd" then stdenvFreeBSD
     else if system == "i686-cygwin" then stdenvCygwin
-    else if system == "i686-msys" then stdenvMinGW
+    else if system == "i686-mingw" then stdenvMinGW
     else if system == "powerpc-darwin" then stdenvDarwin
     else if system == "i686-darwin" then stdenvNix
     else stdenvNative;
diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix
index 54970acce4ca..cb4e24ef5050 100644
--- a/pkgs/stdenv/mingw/default.nix
+++ b/pkgs/stdenv/mingw/default.nix
@@ -61,10 +61,11 @@ let {
     stdenvInit1.mkDerivation {
       name = "msys-1.0.11";
       builder = ./msys-builder.sh;
-      src = fetchurl {
+      src = ./msys-1.0.11.tar.gz; 
+      /* fetchurl {
         url = http://www.cs.uu.nl/people/martin/msys-1.0.11.tar.gz;
         md5 = "7e76eec10a205ea63ada6a4e834cc468";
-      };
+      }; */
     };
 
   /**