diff --git a/emsdk b/emsdk
index 260f6b4..b476e37 100755
--- a/emsdk
+++ b/emsdk
@@ -128,8 +128,8 @@ if WINDOWS:
     vs2015_exists = 'VS140COMNTOOLS' in os.environ or 'VSSDK140Install' in os.environ or os.path.isdir(os.path.join(program_files, 'Microsoft Visual Studio 14.0'))
     vs2013_exists = 'VS120COMNTOOLS' in os.environ or os.path.isdir(os.path.join(program_files, 'Microsoft Visual Studio 12.0'))
     mingw_exists = which('mingw32-make') != None and which('g++') != None
-    if vs2017_exists: CMAKE_GENERATOR = 'Visual Studio 15'
-    elif vs2015_exists: CMAKE_GENERATOR = 'Visual Studio 14'
+    if vs2015_exists: CMAKE_GENERATOR = 'Visual Studio 14'
+    elif vs2017_exists: CMAKE_GENERATOR = 'Visual Studio 15' # VS2017 has an LLVM build issue, see https://github.com/kripken/emscripten-fastcomp/issues/185
     elif mingw_exists: CMAKE_GENERATOR = 'MinGW Makefiles'
     elif vs2013_exists: CMAKE_GENERATOR = 'Visual Studio 12' # VS2013 is no longer supported, so attempt it as a last resort if someone might want to insist using it.
     else: CMAKE_GENERATOR = '' # No detected generator