diff --git a/third_party/premake-core b/third_party/premake-core
index 8f0683d82..5dfb0238b 160000
--- a/third_party/premake-core
+++ b/third_party/premake-core
@@ -1 +1 @@
-Subproject commit 8f0683d823963d097cf4bc2958b5f50f35f6456a
+Subproject commit 5dfb0238bc309df04819dd430def621ce854678d
diff --git a/tools/build/bin/premake5.exe b/tools/build/bin/premake5.exe
index e89ef4e38..bcf844443 100644
Binary files a/tools/build/bin/premake5.exe and b/tools/build/bin/premake5.exe differ
diff --git a/xenia-build b/xenia-build
index 89bc91624..8aa8b50ca 100755
--- a/xenia-build
+++ b/xenia-build
@@ -356,7 +356,11 @@ def run_platform_premake():
   if sys.platform == 'darwin':
     return run_premake('macosx', 'xcode4')
   elif sys.platform == 'win32':
-    return run_premake('windows', 'vs2015')
+    vs_version = '2015'
+    if 'VSVERSION' in os.environ:
+      vs_version = os.environ['VSVERSION']
+
+    return run_premake('windows', 'vs' + vs_version)
   else:
     ret = run_premake('linux', 'gmake')
     ret = ret != 0 and run_premake('linux', 'codelite') or ret