diff --git a/packages/devel/llvm-host/build b/packages/devel/llvm-host/build
deleted file mode 100755
index 0d25e7cbbb..0000000000
--- a/packages/devel/llvm-host/build
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-$SCRIPTS/unpack llvm
-
-setup_toolchain host
-
-if [ "$TARGET_ARCH" = i386 ]; then
-  ARCH=x86
-elif [ "$TARGET_ARCH" = x86_64 ]; then
-  ARCH=x86_64
-fi
-
-LLVM_DIR=`ls -d $BUILD/llvm-[0-9]*`
-
-cd $LLVM_DIR
-
-cd autoconf
-  aclocal  --force --verbose -I m4
-  autoconf --force --verbose -I m4 -o ../configure
-cd ..
-
-mkdir -p .build-host && cd .build-host
-
-../configure --host=$HOST_NAME \
-             --build=$HOST_NAME \
-             --prefix=$ROOT/$TOOLCHAIN \
-             --enable-polly \
-             --enable-optimized \
-             --disable-profiling \
-             --disable-assertions \
-             --disable-expensive-checks \
-             --disable-debug-runtime \
-             --disable-debug-symbols \
-             --enable-jit \
-             --disable-docs \
-             --disable-doxygen \
-             --enable-threads \
-             --enable-pthreads \
-             --enable-pic \
-             --enable-shared \
-             --enable-embed-stdcxx \
-             --enable-timestamps \
-             --enable-targets=$ARCH \
-
-make
-make install
\ No newline at end of file
diff --git a/packages/devel/llvm/build b/packages/devel/llvm/build
index b31ec67c27..4e17d01409 100755
--- a/packages/devel/llvm/build
+++ b/packages/devel/llvm/build
@@ -36,7 +36,6 @@ LLVM_DIR=`ls -d $BUILD/llvm-[0-9]*`
 cd $LLVM_DIR
 
 mkdir -p .build-target && cd .build-target
-
 ../configure --host=$TARGET_NAME \
              --build=$HOST_NAME \
              --prefix=/usr \
@@ -57,11 +56,13 @@ mkdir -p .build-target && cd .build-target
              --enable-embed-stdcxx \
              --enable-timestamps \
              --enable-targets=$LLVM_ARCH \
+             --disable-libffi \
+             --disable-ltdl-install \
 
-TBLGEN="$ROOT/$TOOLCHAIN/bin/tblgen" \
-TCLSH="$ROOT/$TOOLCHAIN/bin/tclsh" \
+LLVM_TBLGEN="$ROOT/$TOOLCHAIN/bin/llvm-tblgen" \
 make
 
-TBLGEN="$ROOT/$TOOLCHAIN/bin/tblgen" \
-TCLSH="$ROOT/$TOOLCHAIN/bin/tclsh" \
+LLVM_TBLGEN="$ROOT/$TOOLCHAIN/bin/llvm-tblgen" \
 $MAKEINSTALL
+
+#TCLSH="$ROOT/$TOOLCHAIN/bin/tclsh" \
diff --git a/packages/devel/llvm/meta b/packages/devel/llvm/meta
index 7a9b830624..5179578b0e 100644
--- a/packages/devel/llvm/meta
+++ b/packages/devel/llvm/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="llvm"
-PKG_VERSION="2.9"
+PKG_VERSION="3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://llvm.org/"
-PKG_URL="http://llvm.org/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_URL="http://llvm.org/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain llvm-host"
 PKG_PRIORITY="optional"
diff --git a/packages/devel/llvm/patches/llvm-2.9-cross.patch b/packages/devel/llvm/patches/llvm-3.0-cross.patch
similarity index 52%
rename from packages/devel/llvm/patches/llvm-2.9-cross.patch
rename to packages/devel/llvm/patches/llvm-3.0-cross.patch
index d258bff854..197553bac4 100644
--- a/packages/devel/llvm/patches/llvm-2.9-cross.patch
+++ b/packages/devel/llvm/patches/llvm-3.0-cross.patch
@@ -1,7 +1,7 @@
-diff -Naur llvm-2.9-old/autoconf/configure.ac llvm-2.9-new/autoconf/configure.ac
---- llvm-2.9-old/autoconf/configure.ac	2011-03-25 00:56:32.000000000 -0700
-+++ llvm-2.9-new/autoconf/configure.ac	2011-05-05 13:33:38.000000000 -0700
-@@ -384,6 +384,10 @@
+diff -Naur llvm-3.0.src/autoconf/configure.ac llvm-3.0.src.patch/autoconf/configure.ac
+--- llvm-3.0.src/autoconf/configure.ac	2011-10-16 04:52:56.000000000 +0200
++++ llvm-3.0.src.patch/autoconf/configure.ac	2011-12-03 12:57:33.324415172 +0100
+@@ -393,6 +393,10 @@
         AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++)
       fi
    fi
@@ -12,9 +12,9 @@ diff -Naur llvm-2.9-old/autoconf/configure.ac llvm-2.9-new/autoconf/configure.ac
  else
    AC_SUBST(LLVM_CROSS_COMPILING, [0])
  fi
-diff -Naur llvm-2.9-old/autoconf/m4/build_exeext.m4 llvm-2.9-new/autoconf/m4/build_exeext.m4
---- llvm-2.9-old/autoconf/m4/build_exeext.m4	2008-09-26 10:27:58.000000000 -0700
-+++ llvm-2.9-new/autoconf/m4/build_exeext.m4	2011-05-05 12:29:10.000000000 -0700
+diff -Naur llvm-3.0.src/autoconf/m4/build_exeext.m4 llvm-3.0.src.patch/autoconf/m4/build_exeext.m4
+--- llvm-3.0.src/autoconf/m4/build_exeext.m4	2008-09-26 19:27:58.000000000 +0200
++++ llvm-3.0.src.patch/autoconf/m4/build_exeext.m4	2011-12-03 12:57:33.327415229 +0100
 @@ -18,7 +18,7 @@
       fi
    fi
@@ -24,10 +24,10 @@ diff -Naur llvm-2.9-old/autoconf/m4/build_exeext.m4 llvm-2.9-new/autoconf/m4/bui
    rm -f conftest*
    echo 'int main () { return 0; }' > conftest.$ac_ext
    ac_cv_build_exeext=
-diff -Naur llvm-2.9-old/Makefile llvm-2.9-new/Makefile
---- llvm-2.9-old/Makefile	2010-11-29 10:16:10.000000000 -0800
-+++ llvm-2.9-new/Makefile	2011-05-05 13:35:06.000000000 -0700
-@@ -104,37 +104,6 @@
+diff -Naur llvm-3.0.src/Makefile llvm-3.0.src.patch/Makefile
+--- llvm-3.0.src/Makefile	2011-10-08 02:27:38.000000000 +0200
++++ llvm-3.0.src.patch/Makefile	2011-12-03 13:00:42.692055438 +0100
+@@ -104,38 +104,6 @@
    DIRS := $(filter-out unittests, $(DIRS))
  endif
  
@@ -45,7 +45,8 @@ diff -Naur llvm-2.9-old/Makefile llvm-2.9-new/Makefile
 -	  unset CFLAGS ; \
 -	  unset CXXFLAGS ; \
 -	  $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
--		--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE); \
+-		--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
+-	        --disable-polly ; \
 -	  cd .. ; \
 -	fi; \
 -	(unset SDKROOT; \
@@ -65,9 +66,9 @@ diff -Naur llvm-2.9-old/Makefile llvm-2.9-new/Makefile
  # Include the main makefile machinery.
  include $(LLVM_SRC_ROOT)/Makefile.rules
  
-diff -Naur llvm-2.9-old/Makefile.config.in llvm-2.9-new/Makefile.config.in
---- llvm-2.9-old/Makefile.config.in	2010-12-28 19:59:14.000000000 -0800
-+++ llvm-2.9-new/Makefile.config.in	2011-05-05 12:25:34.000000000 -0700
+diff -Naur llvm-3.0.src/Makefile.config.in llvm-3.0.src.patch/Makefile.config.in
+--- llvm-3.0.src/Makefile.config.in	2011-10-13 19:27:34.000000000 +0200
++++ llvm-3.0.src.patch/Makefile.config.in	2011-12-03 12:57:33.962427436 +0100
 @@ -113,6 +113,10 @@
  # call if we're cross-compiling).
  BUILD_CC=@BUILD_CC@
@@ -79,27 +80,30 @@ diff -Naur llvm-2.9-old/Makefile.config.in llvm-2.9-new/Makefile.config.in
  
  # Triple for configuring build tools when cross-compiling
  BUILD_TRIPLE=@build@
-diff -Naur llvm-2.9-old/Makefile.rules llvm-2.9-new/Makefile.rules
---- llvm-2.9-old/Makefile.rules	2011-03-24 23:26:58.000000000 -0700
-+++ llvm-2.9-new/Makefile.rules	2011-05-05 12:24:42.000000000 -0700
-@@ -647,15 +647,15 @@
- 	         $(CPP.BaseFlags)
+diff -Naur llvm-3.0.src/Makefile.rules llvm-3.0.src.patch/Makefile.rules
+--- llvm-3.0.src/Makefile.rules	2011-10-11 14:51:44.000000000 +0200
++++ llvm-3.0.src.patch/Makefile.rules	2011-12-03 12:59:37.459801461 +0100
+@@ -641,18 +641,18 @@
  
  ifeq ($(BUILD_COMPONENT), 1)
--  Compile.C     = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
-+  Compile.C     = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) \
+   Compile.C     = $(Compile.Wrapper) \
+-	          $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
++	          $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) \
                    $(TargetCommonOpts) $(CompileCommonOpts) -c
--  Compile.CXX   = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
-+  Compile.CXX   = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \
+   Compile.CXX   = $(Compile.Wrapper) \
+-	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
++	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \
  		  $(CPPFLAGS) \
                    $(TargetCommonOpts) $(CompileCommonOpts) -c
--  Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \
-+  Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(BUILD_CPPFLAGS) $(TargetCommonOpts) \
+   Preprocess.CXX= $(Compile.Wrapper) \
+-	          $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \
++	          $(BUILD_CXX) $(CPP.Flags) $(BUILD_CPPFLAGS) $(TargetCommonOpts) \
                    $(CompileCommonOpts) $(CXX.Flags) -E
--  Link          = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
+   Link          = $(Compile.Wrapper) \
+-	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
 -		  $(LD.Flags) $(LDFLAGS) \
-+  Link          = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \
++	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \
 +		  $(LD.Flags) $(BUILD_LDFLAGS) \
                    $(TargetCommonOpts) $(CompileCommonOpts) $(Strip)
  else
-   Compile.C     = $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
+   Compile.C     = $(Compile.Wrapper) \
diff --git a/packages/devel/llvm-host/meta b/packages/devel/llvm/rename
old mode 100644
new mode 100755
similarity index 57%
rename from packages/devel/llvm-host/meta
rename to packages/devel/llvm/rename
index 236dc4b165..542e124c11
--- a/packages/devel/llvm-host/meta
+++ b/packages/devel/llvm/rename
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
@@ -18,19 +20,6 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="llvm"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://llvm.org/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache"
-PKG_PRIORITY="optional"
-PKG_SECTION="toolchain/lang"
-PKG_SHORTDESC="llvm: Low Level Virtual Machine"
-PKG_LONGDESC="Low-Level Virtual Machine (LLVM) is a compiler infrastructure designed for compile-time, link-time, run-time, and "idle-time" optimization of programs from arbitrary programming languages. It currently supports compilation of C, Objective-C, and C++ programs, using front-ends derived from GCC 4.0, GCC 4.2, and a custom new front-end, "clang". It supports x86, x86-64, ia64, PowerPC, and SPARC, with support for Alpha and ARM under development."
-PKG_IS_ADDON="no"
+. config/options $1
 
-PKG_AUTORECONF="no"
+mv $BUILD/$PKG_NAME-$PKG_VERSION.src $BUILD/$PKG_NAME-$PKG_VERSION