diff --git a/srcpkgs/clang-analyzer b/srcpkgs/clang-analyzer
new file mode 120000
index 00000000000..0d68131b9b3
--- /dev/null
+++ b/srcpkgs/clang-analyzer
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/llvm/clang-analyzer.template b/srcpkgs/llvm/clang-analyzer.template
new file mode 100644
index 00000000000..241ad483fe9
--- /dev/null
+++ b/srcpkgs/llvm/clang-analyzer.template
@@ -0,0 +1,35 @@
+# Template file for 'clang-analyzer'.
+#
+short_desc="Low-Level Virtual Machine (LLVM) - A source code analysis framework"
+long_desc="
+ The Clang Static Analyzer is source code analysis tool that find bugs in
+ C and Objective-C programs.
+
+ Currently it can be run either as a standalone tool or within Xcode. The
+ standalone tool is invoked from the command-line, and is intended to be run
+ in tandem with a build of a codebase.
+
+ The analyzer is 100% open source and is part of the Clang project. Like the
+ rest of Clang, the analyzer is implemented as a C++ library that can be used
+ by other tools and applications."
+
+noarch=yes
+Add_dependency run clang
+Add_dependency run python
+Add_dependency run perl
+
+do_install()
+{
+	install -d ${DESTDIR}/usr/bin
+	install -d ${DESTDIR}/usr/lib/clang-analyzer
+
+	for f in build view; do
+		cp -r ${wrksrc}/tools/clang/tools/scan-${f} \
+			${DESTDIR}/usr/lib/clang-analyzer
+		cd ${DESTDIR}/usr/bin && \
+			ln -s ../lib/${pkgname}/scan-${f}/scan-${f} \
+			scan-${f}
+	done
+	python -m compileall ${DESTDIR}/usr/lib/clang-analyzer
+	python -O -m compileall ${DESTDIR}/usr/lib/clang-analyzer
+}
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 3b09df41ba3..59ef3c92725 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -47,7 +47,8 @@ long_desc="
     optional LLVM components can be used to build high-level virtual machines
     and other systems that need these services."
 
-subpackages="libclang clang clang-devel libllvm llvm-devel llvm-docs"
+subpackages="libclang clang-analyzer clang clang-devel libllvm"
+subpackages="${subpackages} llvm-devel llvm-docs"
 
 # XXX: Investigate bindings support.
 Add_dependency run libgcc