Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -817,3 +817,11 @@
     ExternalProject_Add_StepTargets(${NEXT_CLANG_STAGE} ${target})
   endforeach()
 endif()
+
+# Do this by hand instead of using add_llvm_utilities(), which
+# tries to create a corresponding executable, which we don't want
+if (LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION)
+  set(CLANG_VISUALIZERS utils/clang.natvis)
+  add_custom_target(ClangVisualizers SOURCES ${CLANG_VISUALIZERS})
+  set_target_properties(ClangVisualizers PROPERTIES FOLDER "Utils")
+endif()
\ No newline at end of file
Index: utils/clang.natvis
===================================================================
--- utils/clang.natvis
+++ utils/clang.natvis
@@ -2,9 +2,10 @@
 <!--
 Visual Studio Native Debugging Visualizers for LLVM
 
-Put this file into "%USERPROFILE%\Documents\Visual Studio 20xx\Visualizers"
-or create a symbolic link so it updates automatically.
--->
+For Visual Studio 2013 only, put this file into 
+"%USERPROFILE%\Documents\Visual Studio 2013\Visualizers" or create a symbolic link so it updates automatically.
+
+For later versions of Visual Studio, no setup is required-->
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
 
   <Type Name="clang::Type">
Index: www/hacking.html
===================================================================
--- www/hacking.html
+++ www/hacking.html
@@ -103,9 +103,11 @@
     <a href="http://llvm.org/svn/llvm-project/cfe/trunk/utils/clang.natvis">
       <tt>utils/clang.natvis</tt></a> provide debugger visualizers 
       that make debugging of more complex data types much easier.</p>
-  <p>Put the files into 
-    <tt>%USERPROFILE%\Documents\Visual Studio 2012\Visualizers</tt> or 
+  <p>For Visual Studio 2013 only, put the files into 
+    <tt>%USERPROFILE%\Documents\Visual Studio 2013\Visualizers</tt> or 
     create a symbolic link so they update automatically.</p>
+  <p>For later versions of Visual Studio, no installation is required.
+    Note also that later versions of Visual Studio also display better visualizations.</p>
 
   <!--=====================================================================-->
   <h2 id="testing">Testing</h2>