diff --git a/.gitignore b/.gitignore
index 4af34870cf..192fdaad5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,10 +20,8 @@ indra/.distcc
 build-vc80/
 build-vc100/
 build-vc120/
-build-vc120-32/
-build-vc120-64/
-build-vc150-32/
-build-vc150-64/
+build-vc[0-9]*-32/
+build-vc[0-9]*-64/
 indra/CMakeFiles
 indra/build-vc[0-9]*
 indra/lib/mono/1.0/*.dll
diff --git a/autobuild.xml b/autobuild.xml
index 5a5ba8aeb9..4400a4a0f8 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3868,6 +3868,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_PLAT|NOTWIN}</string>
                 </array>
               </map>
               <key>default</key>
@@ -3906,6 +3908,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_PLAT|NOTWIN}</string>
                   <string>-DUNATTENDED:BOOL=ON</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
@@ -3940,6 +3944,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_PLAT|NOTWIN}</string>
                 </array>
               </map>
               <key>name</key>
@@ -3976,6 +3982,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_PLAT|NOTWIN}</string>
                   <string>-DUNATTENDED:BOOL=ON</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>