Index: tools/msbuild/LLVM.Cpp.Common.props
===================================================================
--- tools/msbuild/LLVM.Cpp.Common.props
+++ tools/msbuild/LLVM.Cpp.Common.props
@@ -37,9 +37,9 @@
 
   <!-- Find an installed LLVM and set up our paths. -->
   <PropertyGroup>
-    <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM@LLVM)</LLVMInstallDir>
-    <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM@LLVM)</LLVMInstallDir>
-    <ClangClExecutable>$(LLVMInstallDir)bin\clang-cl.exe</ClangClExecutable>
+    <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM)</LLVMInstallDir>
+    <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</LLVMInstallDir>
+    <ClangClExecutable>$(LLVMInstallDir)\bin\clang-cl.exe</ClangClExecutable>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props" Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props')"/>
Index: tools/msbuild/llvm-general.xml
===================================================================
--- tools/msbuild/llvm-general.xml
+++ tools/msbuild/llvm-general.xml
@@ -16,7 +16,7 @@
                   DisplayName="Clang-CL Executable"
                   Description="Specifies the path to clang-cl.exe."
                   Category="General"
-                  Default="$(LLVMInstallDir)bin\clang-cl.exe"
+                  Default="$(LLVMInstallDir)\bin\clang-cl.exe"
                   Subtype="file">
     <StringProperty.DataSource>
       <DataSource Persistence="ProjectFile" Label="" />