diff --git a/clang/utils/ccc-analyzer b/clang/tools/scan-build/ccc-analyzer
similarity index 100%
rename from clang/utils/ccc-analyzer
rename to clang/tools/scan-build/ccc-analyzer
diff --git a/clang/utils/scan-build b/clang/tools/scan-build/scan-build
similarity index 100%
rename from clang/utils/scan-build
rename to clang/tools/scan-build/scan-build
diff --git a/clang/utils/scanview.css b/clang/tools/scan-build/scanview.css
similarity index 100%
rename from clang/utils/scanview.css
rename to clang/tools/scan-build/scanview.css
diff --git a/clang/utils/sorttable.js b/clang/tools/scan-build/sorttable.js
similarity index 100%
rename from clang/utils/sorttable.js
rename to clang/tools/scan-build/sorttable.js
diff --git a/clang/www/analyzer/installation.html b/clang/www/analyzer/installation.html
index 891353562136..81f45514fc01 100644
--- a/clang/www/analyzer/installation.html
+++ b/clang/www/analyzer/installation.html
@@ -100,7 +100,7 @@ the installation directory of your choice (specified when you run
 programs.
 
 <p>Currently these are not installed using <tt>make install</tt>, and
-are located in <tt>$(SRCDIR)/tools/clang/util</tt> and
+are located in <tt>$(SRCDIR)/tools/clang/tools/scan-build</tt> and
 <tt>$(SRCDIR)/tools/clang/tools/scan-view</tt> respectively (where
 <tt>$(SRCDIR)</tt> is the root LLVM source directory).  These locations
 are subject to change.</p></li>