diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 7cd402c363..68b49ab67a 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -2,12 +2,13 @@
 pkgname=llvm
 version=3.4.2
 wrksrc="llvm-${version}.src"
-revision=3
+revision=4
 lib32disabled=yes
 configure_args="--disable-expensive-checks --disable-debug-runtime
  --enable-bindings=none --enable-optimize --enable-shared --enable-libffi
  --enable-llvmc-dynamic --disable-assertions --enable-keep-symbols
  --enable-experimental-targets=R600"
+conflicts="llvm-git>=0"
 short_desc="Low Level Virtual Machine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.llvm.org"
@@ -85,6 +86,7 @@ clang-analyzer_package() {
 	noarch=yes
 	pycompile_dirs="usr/lib/clang-analyzer"
 	depends="clang-${version}_${revision} python"
+	conflicts="clang-analyzer-git>=0"
 	short_desc="Low-Level Virtual Machine (LLVM) - A source code analysis framework"
 	homepage="http://clang-analyzer.llvm.org/"
 	pkg_install() {
@@ -104,6 +106,7 @@ clang-analyzer_package() {
 clang_package() {
 	lib32disabled=yes
 	depends="libstdc++-devel binutils gcc"
+	conflicts="clang-git>=0"
 	short_desc+=" - C language family frontend"
 	homepage="http://clang.llvm.org/"
 	pkg_install() {
@@ -118,6 +121,7 @@ clang_package() {
 
 llvm-docs_package() {
 	noarch=yes
+	conflicts="llvm-docs-git>=0"
 	short_desc+=" - documentation files"
 	pkg_install() {
 		vmove usr/share/doc