diff --git a/common/shlibs b/common/shlibs
index 93cf12d397c..e6d6f0c53ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -921,3 +921,5 @@ libyaml-0.so.2			libyaml			libyaml-devel
 libgtksourceviewmm-3.0.so.0	gtksourceviewmm		gtksourceviewmm-devel
 libyajl.so.2			yajl			yajl-devel
 libconfuse.so.0			confuse			confuse-devel
+libLLVM-3.0.so			libllvm			llvm-devel
+libclang.so			libclang		libclang-devel
diff --git a/srcpkgs/llvm/clang-analyzer.template b/srcpkgs/llvm/clang-analyzer.template
index ed7a9bc0963..2a27f4507cc 100644
--- a/srcpkgs/llvm/clang-analyzer.template
+++ b/srcpkgs/llvm/clang-analyzer.template
@@ -13,7 +13,6 @@ long_desc="
  rest of Clang, the analyzer is implemented as a C++ library that can be used
  by other tools and applications."
 
-revision=1
 noarch=yes
 pycompile_dirs="usr/lib/clang-analyzer"
 
@@ -33,6 +32,4 @@ do_install()
 			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/clang-devel.template b/srcpkgs/llvm/clang-devel.template
index c08ede58c7e..8ef99fabb1b 100644
--- a/srcpkgs/llvm/clang-devel.template
+++ b/srcpkgs/llvm/clang-devel.template
@@ -28,8 +28,6 @@ long_desc="
 
   This package includes development files for the LLVM clang."
 
-revision=1
-
 Add_dependency run clang
 
 do_install()
diff --git a/srcpkgs/llvm/clang.rshlibs b/srcpkgs/llvm/clang.rshlibs
index 747c7a553df..f1b4df01e3a 100644
--- a/srcpkgs/llvm/clang.rshlibs
+++ b/srcpkgs/llvm/clang.rshlibs
@@ -1,5 +1,7 @@
-libLLVM-2.9.so
 libpthread.so.0
 libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
+libLLVM-3.0.so
+libdl.so.2
+libm.so.6
diff --git a/srcpkgs/llvm/clang.template b/srcpkgs/llvm/clang.template
index 1fccbdcf01f..497975bd39f 100644
--- a/srcpkgs/llvm/clang.template
+++ b/srcpkgs/llvm/clang.template
@@ -26,10 +26,7 @@ long_desc="
    * A single unified parser for C, Objective C, C++, and Objective C++
    * Conformance with C/C++/ObjC and their variants"
 
-revision=2
-
 Add_dependency run libffi
-Add_dependency run llvm
 Add_dependency run gcc ">=4.5"
 
 do_install()
diff --git a/srcpkgs/llvm/depends b/srcpkgs/llvm/depends
index e1cbe2240d9..75e34751ebf 100644
--- a/srcpkgs/llvm/depends
+++ b/srcpkgs/llvm/depends
@@ -1,3 +1,3 @@
 # Only accept the same ABI version.
-abi_depends=">=2.9"
+abi_depends=">=3.0"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/llvm/libclang.rshlibs b/srcpkgs/llvm/libclang.rshlibs
index fbc195ea2c3..96064d54976 100644
--- a/srcpkgs/llvm/libclang.rshlibs
+++ b/srcpkgs/llvm/libclang.rshlibs
@@ -1,6 +1,6 @@
-libLLVM-2.9.so
 libpthread.so.0
 libdl.so.2
 libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
+libLLVM-3.0.so
diff --git a/srcpkgs/llvm/libclang.template b/srcpkgs/llvm/libclang.template
index 2e44d7a398c..898db4d0aa6 100644
--- a/srcpkgs/llvm/libclang.template
+++ b/srcpkgs/llvm/libclang.template
@@ -28,8 +28,6 @@ long_desc="
 
  This package includes the shared library used by the Clang frontend."
 
-revision=2
-
 Add_dependency run libffi
 
 do_install()
diff --git a/srcpkgs/llvm/libllvm.template b/srcpkgs/llvm/libllvm.template
index c22cffb58ee..c86a76320a5 100644
--- a/srcpkgs/llvm/libllvm.template
+++ b/srcpkgs/llvm/libllvm.template
@@ -6,9 +6,6 @@ long_desc="
 
  This package includes the shared libraries used by the LLVM projects."
 
-revision=2
-
-
 do_install()
 {
 	install -d ${DESTDIR}/usr/lib
diff --git a/srcpkgs/llvm/llvm-devel.template b/srcpkgs/llvm/llvm-devel.template
index 014c59f0a69..d56232ab3d6 100644
--- a/srcpkgs/llvm/llvm-devel.template
+++ b/srcpkgs/llvm/llvm-devel.template
@@ -6,8 +6,6 @@ long_desc="
 
   This package includes development files for the LLVM clang."
 
-revision=1
-
 Add_dependency run libffi-devel
 Add_dependency run libllvm
 Add_dependency run llvm
diff --git a/srcpkgs/llvm/llvm.rshlibs b/srcpkgs/llvm/llvm.rshlibs
index e9b4e53acd1..2b9d43d40ea 100644
--- a/srcpkgs/llvm/llvm.rshlibs
+++ b/srcpkgs/llvm/llvm.rshlibs
@@ -1,7 +1,8 @@
-libLLVM-2.9.so
 libpthread.so.0
 libstdc++.so.6
 libc.so.6
 libdl.so.2
 libm.so.6
 libgcc_s.so.1
+libLLVM-3.0.so
+libclang.so
diff --git a/srcpkgs/llvm/patches/bug-9869-operator-h-c++0x.patch b/srcpkgs/llvm/patches/bug-9869-operator-h-c++0x.patch
deleted file mode 100644
index 8b897fbdcc5..00000000000
--- a/srcpkgs/llvm/patches/bug-9869-operator-h-c++0x.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-# Fix upstream bug #9869:
-#   Operator.h incompatibility with GCC 4.6 in C++0x mode
-
---- include/llvm/Operator.h	2011/02/07 16:40:21	125006
-+++ include/llvm/Operator.h	2011/05/08 01:59:22	131062
-@@ -186,28 +186,46 @@
- };
- 
- class AddOperator
--  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {};
-+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {
-+  ~AddOperator(); // DO NOT IMPLEMENT
-+};
- class SubOperator
--  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {};
-+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {
-+  ~SubOperator(); // DO NOT IMPLEMENT
-+};
- class MulOperator
--  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {};
-+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {
-+  ~MulOperator(); // DO NOT IMPLEMENT
-+};
- class ShlOperator
--  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {};
-+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {
-+  ~ShlOperator(); // DO NOT IMPLEMENT
-+};
- 
-   
- class SDivOperator
--  : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {};
-+  : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {
-+  ~SDivOperator(); // DO NOT IMPLEMENT
-+};
- class UDivOperator
--  : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {};
-+  : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {
-+  ~UDivOperator(); // DO NOT IMPLEMENT
-+};
- class AShrOperator
--  : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {};
-+  : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {
-+  ~AShrOperator(); // DO NOT IMPLEMENT
-+};
- class LShrOperator
--  : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {};
-+  : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {
-+  ~LShrOperator(); // DO NOT IMPLEMENT
-+};
-   
-   
-   
- class GEPOperator
-   : public ConcreteOperator<Operator, Instruction::GetElementPtr> {
-+  ~GEPOperator(); // DO NOT IMPLEMENT
-+
-   enum {
-     IsInBounds = (1 << 0)
-   };
diff --git a/srcpkgs/llvm/patches/cindexer-clang-path.patch b/srcpkgs/llvm/patches/cindexer-clang-path.patch
deleted file mode 100644
index 954a67c2176..00000000000
--- a/srcpkgs/llvm/patches/cindexer-clang-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/clang/tools/libclang/CIndexer.cpp.orig	2011-04-07 13:08:24.000000000 +0300
-+++ tools/clang/tools/libclang/CIndexer.cpp	2011-04-07 13:11:52.224884642 +0300
-@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
-   
-   // We now have the CIndex directory, locate clang relative to it.
-   LibClangPath.eraseComponent();
-+  LibClangPath.eraseComponent();
- #endif
-   
-   LibClangPath.appendComponent("clang");
diff --git a/srcpkgs/llvm/patches/clang-plugin-loader-registry.patch b/srcpkgs/llvm/patches/clang-plugin-loader-registry.patch
deleted file mode 100644
index 5afa2804ca3..00000000000
--- a/srcpkgs/llvm/patches/clang-plugin-loader-registry.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Get the correct list of symbols to export
-# See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html
-
---- autoconf/ExportMap.map	2010-02-25 00:33:41.000000000 +0200
-+++ autoconf/ExportMap.map	2010-05-10 14:14:22.000000000 +0300
-@@ -2,6 +2,7 @@
- 	global: main;
- 		__progname;
- 		environ;
-+		_ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
- 
- 	local: *;
- };
diff --git a/srcpkgs/llvm/patches/clang-toolchains-gcc-versions.patch b/srcpkgs/llvm/patches/clang-toolchains-gcc-versions.patch
deleted file mode 100644
index 145f3400c03..00000000000
--- a/srcpkgs/llvm/patches/clang-toolchains-gcc-versions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# Make all gcc 4.[56] from xbps work.
---- tools/clang/lib/Driver/ToolChains.cpp	2011-03-21 23:29:27.000000000 +0200
-+++ tools/clang/lib/Driver/ToolChains.cpp	2011-04-08 00:03:34.000000000 +0300
-@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const
-       GccTriple = "i586-suse-linux";
-   }
- 
--  const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-+  const char* GccVersions[] = {"4.6.2", "4.6", "4.5",
-                                "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
-                                "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
-                                "4.2"};
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 797e4c99512..2ab23e17c6b 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,10 +1,10 @@
 # Template file for 'llvm'
 pkgname=llvm
-version=2.9
-revision=2
+version=3.0
+wrksrc=${pkgname}-${version}.src
 distfiles="
-http://www.llvm.org/releases/${version}/llvm-${version}.tgz
-http://www.llvm.org/releases/${version}/clang-${version}.tgz"
+http://www.llvm.org/releases/${version}/llvm-${version}.tar.gz
+http://www.llvm.org/releases/${version}/clang-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-expensive-checks --disable-debug-runtime
 --enable-targets=all --enable-bindings=none --enable-optimize
@@ -14,8 +14,8 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.llvm.org"
 license="BSD"
 checksum="
-661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
-70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df"
+519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477
+b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d"
 
 long_desc="
  Low Level Virtual Machine (LLVM) is:
@@ -53,8 +53,6 @@ subpackages="libclang clang-analyzer clang clang-devel libllvm"
 subpackages="${subpackages} llvm-devel llvm-docs"
 
 # XXX: Investigate bindings support.
-Add_dependency run libffi
-Add_dependency run libclang
 Add_dependency build groff
 Add_dependency build perl
 Add_dependency build python
@@ -62,12 +60,7 @@ Add_dependency build libffi-devel
 
 post_extract() {
 	# Move clang files into the llvm source.
-	if [ -d ${XBPS_BUILDDIR}/clang-${version} ]; then
-		mv ${XBPS_BUILDDIR}/clang-${version} ${wrksrc}/tools/clang
+	if [ -d ${XBPS_BUILDDIR}/clang-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/clang-${version}.src ${wrksrc}/tools/clang
 	fi
 }
-
-pre_install() {
-	# for pod2html
-	export PATH=$PATH:/usr/lib/perl5/core_perl/bin
-}