diff --git a/Build/EvilLinker.hs b/Build/EvilLinker.hs
index 7b6441e39e..c36ec33f3c 100644
--- a/Build/EvilLinker.hs
+++ b/Build/EvilLinker.hs
@@ -15,10 +15,12 @@ import Text.Parsec
 import Text.Parsec.String
 import Control.Applicative ((<$>))
 import Control.Monad
+import System.Directory
+import Data.Maybe
 
 import Utility.Monad
 import Utility.Process
-import System.Directory
+import Utility.Env
 
 data CmdParams = CmdParams
 	{ cmd :: String
@@ -121,7 +123,9 @@ restOfLine = newline `after` many (noneOf "\n")
 getOutput :: String -> [String] -> Maybe [(String, String)] -> IO (String, Bool)
 getOutput c ps environ = do
 	putStrLn $ unwords [c, show ps]
-	out@(s, ok) <- processTranscript' c ps environ Nothing
+	systemenviron <- getEnvironment
+	let environ' = fromMaybe [] environ ++ systemenviron
+	out@(s, ok) <- processTranscript' c ps (Just environ') Nothing
 	putStrLn $ unwords [c, "finished", show ok, "output size:", show (length s)]
 	return out
 
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh
index 78036ca6b4..d1ecab3ed4 100755
--- a/standalone/windows/build.sh
+++ b/standalone/windows/build.sh
@@ -51,13 +51,6 @@ withcyg cabal configure
 if ! withcyg cabal build; then
 	rm -f Build/EvilLinker.exe
 	ghc --make Build/EvilLinker
-	WINDIR='C:\Windows\Temp'
-	export WINDIR
-	mkdir tmp
-	TMP=tmp
-	TEMP=tmp
-	export TMP
-	export TEMP
 	Build/EvilLinker
 fi