diff --git a/autobuild.xml b/autobuild.xml
index 3107d77548..8079e44781 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3895,7 +3895,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 1fc578e956..4f1beb4e0b 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 09a97fc03e..11aeaea4ce 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -60,7 +60,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)
@@ -69,6 +68,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)