--- a/b2g/config/mozconfigs/win32_gecko/debug
+++ b/b2g/config/mozconfigs/win32_gecko/debug
@@ -9,21 +9,17 @@ ac_add_options --enable-jemalloc
 ac_add_options --enable-signmar
 ac_add_options --enable-debug
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
-if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2013-win64
-else
-  . $topsrcdir/build/win32/mozconfig.vs2013
-fi
+. $topsrcdir/build/win32/mozconfig.vs-latest
 
 # B2G Options
 ac_add_options --enable-application=b2g
 ENABLE_MARIONETTE=1
 
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia

--- a/b2g/config/mozconfigs/win32_gecko/nightly
+++ b/b2g/config/mozconfigs/win32_gecko/nightly
@@ -9,21 +9,17 @@ ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-signmar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
-if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2013-win64
-else
-  . $topsrcdir/build/win32/mozconfig.vs2013
-fi
+. $topsrcdir/build/win32/mozconfig.vs-latest
 
 # B2G Options
 ac_add_options --enable-application=b2g
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
 
 # Include Firefox OS fonts.

--- a/b2g/graphene/config/horizon-mozconfigs/win32/debug
+++ b/b2g/graphene/config/horizon-mozconfigs/win32/debug
@@ -4,20 +4,16 @@ ac_add_options --enable-jemalloc
 ac_add_options --enable-debug
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2013-win64
-else
-  . $topsrcdir/build/win32/mozconfig.vs2013
-fi
+. $topsrcdir/build/win32/mozconfig.vs-latest
 
 # graphene Options
 ENABLE_MARIONETTE=1
 
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 . "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"

--- a/b2g/graphene/config/horizon-mozconfigs/win32/nightly
+++ b/b2g/graphene/config/horizon-mozconfigs/win32/nightly
@@ -6,18 +6,14 @@ ac_add_options --enable-jemalloc
 ac_add_options --enable-signmar
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2013-win64
-else
-  . $topsrcdir/build/win32/mozconfig.vs2013
-fi
+. $topsrcdir/build/win32/mozconfig.vs-latest
 
 # graphene Options
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 . "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common.override"

--- a/b2g/graphene/config/horizon-mozconfigs/win64/debug
+++ b/b2g/graphene/config/horizon-mozconfigs/win64/debug
@@ -21,13 +21,13 @@ ac_add_options --with-google-oauth-api-k
 export MOZILLA_OFFICIAL=1
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
-. $topsrcdir/build/win64/mozconfig.vs2013
+. $topsrcdir/build/win64/mozconfig.vs-latest
 
 . "$topsrcdir/build/mozconfig.cache"
 
 . "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common.override"

--- a/b2g/graphene/config/horizon-mozconfigs/win64/nightly
+++ b/b2g/graphene/config/horizon-mozconfigs/win64/nightly
@@ -3,17 +3,17 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
   MOZ_AUTOMATION_UPDATE_PACKAGING=1
 fi
 
 . "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
-. $topsrcdir/build/win64/mozconfig.vs2013
+. $topsrcdir/build/win64/mozconfig.vs-latest
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-signmar
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics

--- a/b2g/graphene/config/mozconfigs/win32/debug
+++ b/b2g/graphene/config/mozconfigs/win32/debug
@@ -4,20 +4,16 @@ ac_add_options --enable-jemalloc
 ac_add_options --enable-debug
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2013-win64
-else
-  . $topsrcdir/build/win32/mozconfig.vs2013
-fi
+. $topsrcdir/build/win32/mozconfig.vs-latest
 
 # graphene Options
 ENABLE_MARIONETTE=1
 
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 . "$topsrcdir/b2g/grapheneconfig/mozconfigs/common.override"

--- a/b2g/graphene/config/mozconfigs/win32/nightly
+++ b/b2g/graphene/config/mozconfigs/win32/nightly
@@ -6,18 +6,14 @@ ac_add_options --enable-jemalloc
 ac_add_options --enable-signmar
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2013-win64
-else
-  . $topsrcdir/build/win32/mozconfig.vs2013
-fi
+. $topsrcdir/build/win32/mozconfig.vs-latest
 
 # graphene Options
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 . "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"

--- a/b2g/graphene/config/mozconfigs/win64/debug
+++ b/b2g/graphene/config/mozconfigs/win64/debug
@@ -21,13 +21,13 @@ ac_add_options --with-google-oauth-api-k
 export MOZILLA_OFFICIAL=1
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
-. $topsrcdir/build/win64/mozconfig.vs2013
+. $topsrcdir/build/win64/mozconfig.vs-latest
 
 . "$topsrcdir/build/mozconfig.cache"
 
 . "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"

--- a/b2g/graphene/config/mozconfigs/win64/nightly
+++ b/b2g/graphene/config/mozconfigs/win64/nightly
@@ -3,17 +3,17 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
   MOZ_AUTOMATION_UPDATE_PACKAGING=1
 fi
 
 . "$topsrcdir/b2g/graphene/config/mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
-. $topsrcdir/build/win64/mozconfig.vs2013
+. $topsrcdir/build/win64/mozconfig.vs-latest
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-signmar
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics

--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig
@@ -6,15 +6,11 @@ ac_add_options --with-l10n-base=../../l1
 ac_add_options --with-windows-version=603
 ac_add_options --with-branding=browser/branding/nightly
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
-if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2015-win64
-else
-  . $topsrcdir/build/win32/mozconfig.vs2015
-fi
+. $topsrcdir/build/win32/mozconfig.vs-latest
 
 . "$topsrcdir/build/mozconfig.common.override"

new file mode 100644
--- /dev/null
+++ b/build/win32/mozconfig.vs-latest
@@ -0,0 +1,5 @@
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+  . mozconfig.vs2015-win64
+else
+  . mozconfig.vs2015
+fi

new file mode 100644
--- /dev/null
+++ b/build/win64/mozconfig.vs-latest
@@ -0,0 +1,1 @@
+. mozconfig.vs2015