diff --git a/autobuild.xml b/autobuild.xml
index 954299d1f36fc574999ec651d744b334b265ecfa..288def254b08f54493fe1ec1d6bc021566809eaa 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3218,11 +3218,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>SecondLife.sln</string>
                 </array>
                 <key>command</key>
-                <string>devenv</string>
+                <string>msbuild.exe</string>
                 <key>options</key>
                 <array>
-                  <string>/build</string>
-                  <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                  <string>/p:Configuration=RelWithDebInfo</string>
+                  <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                  <string>/t:Build</string>
+                  <string>/p:useenv=true</string>
+                  <string>/verbosity:minimal</string>
+                  <string>/p:VCBuildAdditionalOptions= /incremental</string>
+                  <string>/m:${AUTOBUILD_CPU_COUNT}</string>
                 </array>
               </map>
               <key>configure</key>
@@ -3262,6 +3267,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
+                  <string>/m:${AUTOBUILD_CPU_COUNT}</string>
                 </array>
               </map>
               <key>configure</key>
@@ -3293,11 +3299,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>SecondLife.sln</string>
                 </array>
                 <key>command</key>
-                <string>devenv</string>
+                <string>msbuild.exe</string>
                 <key>options</key>
                 <array>
-                  <string>/build</string>
-                  <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                  <string>/p:Configuration=Release</string>
+                  <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                  <string>/t:Build</string>
+                  <string>/p:useenv=true</string>
+                  <string>/verbosity:minimal</string>
+                  <string>/p:VCBuildAdditionalOptions= /incremental</string>
+                  <string>/m:${AUTOBUILD_CPU_COUNT}</string>
                 </array>
               </map>
               <key>configure</key>
@@ -3335,6 +3346,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
+                  <string>/m:${AUTOBUILD_CPU_COUNT}</string>
                 </array>
               </map>
               <key>configure</key>