diff --git a/autobuild.xml b/autobuild.xml
index cbd741303453692a6bd145c0089249881f383b05..bd92cee6a36681cb4ff141559ec971537f8b3fbc 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3769,7 +3769,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>windows</key>
         <map>
           <key>build_directory</key>
-          <string>build-vc120-$AUTOBUILD_ADDRSIZE</string>
+          <string>build-vc${AUTOBUILD_VSVER|120}-$AUTOBUILD_ADDRSIZE</string>
           <key>configurations</key>
           <map>
             <key>RelWithDebInfo</key>
diff --git a/build.sh b/build.sh
index e35028ad6e12779e84aacfb1935e00512215d239..545c913f92c90694b38fb0b1d38f0371badfaa0a 100755
--- a/build.sh
+++ b/build.sh
@@ -28,7 +28,7 @@ build_dir_Linux()
 
 build_dir_CYGWIN()
 {
-  echo build-vc120-${AUTOBUILD_ADDRSIZE}
+  echo build-vc${AUTOBUILD_VSVER:-120}-${AUTOBUILD_ADDRSIZE}
 }
 
 viewer_channel_suffix()
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index c73a1fdb47b3e78f5de6bfe751d0d76a8b73eb06..a8b353ff33649fcfed282e1b64794ec7b91d8a20 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -73,7 +73,6 @@ if(WINDOWS)
 
     #*******************************
     # Copy MS C runtime dlls, required for packaging.
-    # *TODO - Adapt this to support VC9
     if (MSVC80)
         list(APPEND LMSVC_VER 80)
         list(APPEND LMSVC_VERDOT 8.0)
@@ -82,6 +81,9 @@ if(WINDOWS)
     elseif (MSVC_VERSION EQUAL 1800) # VisualStudio 2013, which is (sigh) VS 12
         list(APPEND LMSVC_VER 120)
         list(APPEND LMSVC_VERDOT 12.0)
+    elseif (MSVC_VERSION EQUAL 1915) # Visual Studio 2017
+        list(APPEND LMSVC_VER 150)
+        list(APPEND LMSVC_VERDOT 15.0)
     else (MSVC80)
         MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake")
     endif (MSVC80)