diff --git a/packages/devel/llvm/package.mk b/packages/devel/llvm/package.mk
index 209f7defc2..6cfa2847e0 100644
--- a/packages/devel/llvm/package.mk
+++ b/packages/devel/llvm/package.mk
@@ -17,12 +17,14 @@
 ################################################################################
 
 PKG_NAME="llvm"
-PKG_VERSION="3.3.src"
+PKG_VERSION="3.4rc3.source"
+PKG_SOURCE_DIR="llvm.src"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://llvm.org/"
-PKG_URL="http://llvm.org/releases/3.3/$PKG_NAME-$PKG_VERSION.tar.gz"
+# PKG_URL="http://llvm.org/releases/3.3/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://llvm.org/pre-releases/3.4/rc3/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS_TARGET="toolchain llvm:host"
 PKG_BUILD_DEPENDS_HOST="toolchain"
@@ -36,17 +38,31 @@ PKG_AUTORECONF="no"
 
 # package specific configure options
 PKG_CONFIGURE_OPTS_HOST="--disable-polly \
+                         --disable-libcpp \
+                         --disable-cxx11 \
+                         --disable-split-dwarf \
+                         --disable-clang-arcmt \
+                         --disable-clang-static-analyzer \
+                         --disable-clang-rewriter \
                          --disable-zlib \
                          --disable-assertions \
+                         --disable-werror \
                          --enable-optimized \
                          --disable-debug-runtime \
                          --disable-debug-symbols \
-                         --enable-experimental-targets=R600"
+                         --enable-targets=r600"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-polly \
+                           --disable-libcpp \
+                           --disable-cxx11 \
+                           --disable-split-dwarf \
+                           --disable-clang-arcmt \
+                           --disable-clang-static-analyzer \
+                           --disable-clang-rewriter \
                            --enable-optimized \
                            --disable-profiling \
                            --disable-assertions \
+                           --disable-werror \
                            --disable-expensive-checks \
                            --disable-debug-runtime \
                            --disable-debug-symbols \
@@ -55,17 +71,19 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-polly \
                            --disable-doxygen \
                            --enable-threads \
                            --enable-pthreads \
+                           --enable-zlib \
                            --enable-pic \
                            --enable-shared \
                            --enable-embed-stdcxx \
                            --enable-timestamps \
+                           --disable-backtraces \
                            --disable-libffi \
                            --disable-ltdl-install"
 
 if [ "$TARGET_ARCH" = i386 ]; then
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86 --enable-experimental-targets=R600"
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86,r600"
 elif [ "$TARGET_ARCH" = x86_64 ]; then
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86_64 --enable-experimental-targets=R600"
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86_64,r600"
 elif [ "$TARGET_ARCH" = arm ]; then
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=arm"
 fi
diff --git a/packages/devel/llvm/patches/llvm-3.3-fix-rpath.patch b/packages/devel/llvm/patches/llvm-3.3-fix-rpath.patch
deleted file mode 100644
index 0bf8e4ffdb..0000000000
--- a/packages/devel/llvm/patches/llvm-3.3-fix-rpath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 59c7f0369a67e1aecf365c92186bc5b45e0efcba
-Author: Stefan Saraev <stefan@saraev.ca>
-Date:   Mon Oct 14 22:03:43 2013 +0300
-
-    fix rpath
-
-diff --git a/Makefile.rules b/Makefile.rules
-index f0c542b..fc5fe64 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -639,11 +639,10 @@ endif
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
-   ifneq ($(HOST_OS), Darwin)
-     ifdef TOOLNAME
--      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
-       ifdef EXAMPLE_TOOL
--        LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
-+        LD.Flags += $(DynamicFlag)
-       else
--        LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag)
-+        LD.Flags += $(DynamicFlag)
-     endif
-   endif
- else
diff --git a/packages/devel/llvm/patches/llvm-3.4-fix-rpath.patch b/packages/devel/llvm/patches/llvm-3.4-fix-rpath.patch
new file mode 100644
index 0000000000..8c13f3bd50
--- /dev/null
+++ b/packages/devel/llvm/patches/llvm-3.4-fix-rpath.patch
@@ -0,0 +1,34 @@
+diff -Naur llvm.src/Makefile.rules llvm.src.patch/Makefile.rules
+--- llvm.src/Makefile.rules	2013-11-15 00:51:29.000000000 +0100
++++ llvm.src.patch/Makefile.rules	2014-01-04 16:33:49.254066226 +0100
+@@ -577,14 +577,6 @@
+   endif
+ endif
+ 
+-ifdef SHARED_LIBRARY
+-ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+-ifneq ($(HOST_OS),Darwin)
+-  LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
+-endif
+-endif
+-endif
+-
+ ifdef TOOL_VERBOSE
+   C.Flags += -v
+   CXX.Flags += -v
+@@ -613,14 +605,7 @@
+   ifndef TOOL_NO_EXPORTS
+     LD.Flags += $(RDYNAMIC)
+   endif
+-  ifneq ($(HOST_OS), Darwin)
+-    ifdef TOOLNAME
+-      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
+-    endif
+-  else
+-    ifneq ($(DARWIN_MAJVERS),4)
+-      LD.Flags += $(RPATH) -Wl,@executable_path/../lib
+-    endif
++  ifeq ($(HOST_OS), Darwin)
+     ifeq ($(RC_XBS),YES)
+       TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)
+       LD.Flags += -Wl,-object_path_lto -Wl,$(TempFile)