diff --git a/app/windows/kdevelop-msvc.bat b/app/windows/kdevelop-msvc.bat
--- a/app/windows/kdevelop-msvc.bat
+++ b/app/windows/kdevelop-msvc.bat
@@ -1,7 +1,10 @@
 setlocal EnableDelayedExpansion
 setlocal enableextensions
 
-if DEFINED VS140COMNTOOLS (
+Rem Check for newest VS (2017) too
+if DEFINED VS150COMNTOOLS (
+    SET "base=%VS150COMNTOOLS%"
+) else ( IF DEFINED VS140COMNTOOLS (
     SET "base=%VS140COMNTOOLS%"
 ) else ( IF DEFINED VS120COMNTOOLS (
     SET "base=%VS120COMNTOOLS%"
@@ -11,9 +14,15 @@
     SET "base=%VS100COMNTOOLS%"
 ) else (
     START CMD /C "The Microsoft Visual C++ compiler was not found on your system, you might not be able to compile programs. && PAUSE"
-) )))
+) ))))
 
-SET script="!base!\..\..\VC\vcvarsall.bat"
+
+Rem VS 2017 changed the layout of the folders and force x64
+if DEFINED VS150COMNTOOLS (
+	SET script="%base%..\..\VC\Auxiliary\Build\vcvarsall.bat" x64
+) else (
+	SET script="!base!\..\..\VC\vcvarsall.bat"
+)
 CALL %script%
 
 FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\Software\KDE\KDevelop" /v Install_Dir`) DO (