diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl
index 4b205078..fc15c906 100755
--- a/tools/buildbot/bootstrap.pl
+++ b/tools/buildbot/bootstrap.pl
@@ -17,7 +17,7 @@ if ($^O eq "linux")
 }
 else
 {
-    Build::Command('"' . $ENV{'MSVC9'} . '" /Rebuild Release builder.csproj');
+    Build::Command('"' . $ENV{'VC9BUILDER'} . '" /rebuild builder.csproj Release');
     Build::Command('move ' . Build::PathFormat('bin/Release/builder.exe') . ' .');
 }
 
@@ -44,7 +44,7 @@ if ($^O eq "linux")
 }
 else
 {
-    print CONF "BuilderPath = " . $ENV{'MSVC9'} . "\n";
+    print CONF "BuilderPath = " . $ENV{'VC9BUILDER'} . "\n";
     print CONF "PDBLog = $root\\OUTPUT\\pdblog.txt\n";
 }
 close(CONF);
diff --git a/tools/builder/Win32Builder.cs b/tools/builder/Win32Builder.cs
index 372fafdf..4d8f9f15 100644
--- a/tools/builder/Win32Builder.cs
+++ b/tools/builder/Win32Builder.cs
@@ -82,7 +82,7 @@ namespace builder
 				info.Arguments = cfg.build_options + " ";
 			}
 
-			info.Arguments += "/rebuild \"" + config_name + "\" " + project_file;
+			info.Arguments += "/rebuild \"" + project_file + "\" \"" + config_name + "\"";
 
 			Process p = Process.Start(info);
 			Console.WriteLine(p.StandardOutput.ReadToEnd());