diff --git a/aarch64-suse-support.patch b/aarch64-suse-support.patch
new file mode 100644
index 0000000..ad00825
--- /dev/null
+++ b/aarch64-suse-support.patch
@@ -0,0 +1,16 @@
+Index: llvm-3.3/tools/clang/lib/Driver/ToolChains.cpp
+===================================================================
+--- llvm-3.3.orig/tools/clang/lib/Driver/ToolChains.cpp
++++ llvm-3.3/tools/clang/lib/Driver/ToolChains.cpp
+@@ -1073,9 +1073,10 @@ Generic_GCC::GCCInstallationDetector::GC
+   // Declare a bunch of static data sets that we'll select between below. These
+   // are specifically designed to always refer to string literals to avoid any
+   // lifetime or initialization issues.
+-  static const char *const AArch64LibDirs[] = { "/lib" };
++  static const char *const AArch64LibDirs[] = { "/lib64", "/lib" };
+   static const char *const AArch64Triples[] = {
+     "aarch64-none-linux-gnu",
++    "aarch64-suse-linux",
+     "aarch64-linux-gnu"
+   };
+ 
diff --git a/llvm.changes b/llvm.changes
index 1710562..d983d67 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 28 11:07:16 UTC 2013 - schwab@suse.de
+
+- aarch64-suse-support.patch: Enable AArch64 suse toolchain support
+
 -------------------------------------------------------------------
 Wed Aug 28 11:02:06 UTC 2013 - idonmez@suse.com
 
diff --git a/llvm.spec b/llvm.spec
index 3550659..92401f7 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -56,6 +56,8 @@ Patch6:         arm_suse_support.diff
 # PATCH-FIX-OPENSUSE unreachable-code.patch -- Unreachable code warning triggered on SLE
 Patch7:         unreachable-code.patch
 Patch8:         cmake-host-triple.patch
+# PATCH-FIX-OPENSUSE aarch64-suse-support.patch -- Enable AArch64 suse toolchain support
+Patch9:         aarch64-suse-support.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -163,6 +165,7 @@ This package contains vim plugins for LLVM like syntax highlighting.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 # We hardcode i586
 rm tools/clang/test/Driver/x86_features.c