diff --git a/llvm.changes b/llvm.changes
index 8b92851..dff9c5c 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec 12 12:36:22 UTC 2014 - idonmez@suse.com
+
+- Conditionalize libcxx{abi} build on build_libcxx variable
+- Turn libc++.so into an ldscript so it links to libc++abi
+  automatically.
+
 -------------------------------------------------------------------
 Tue Oct 21 08:39:22 UTC 2014 - dmueller@suse.com
 
diff --git a/llvm.spec b/llvm.spec
index 567fcfc..57cd92a 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -19,6 +19,12 @@
 %define _revision       216961
 %define _release_version 3.5.0
 
+%define build_libcxx 0
+
+%ifarch x86_64
+%define build_libcxx 1
+%else
+
 Name:           llvm
 Version:        3.5.0
 Release:        0
@@ -169,7 +175,7 @@ This package contains the Python bindings to clang (C language) frontend for LLV
 mv cfe-%{version}.src tools/clang
 mv compiler-rt-%{version}.src projects/compiler-rt
 
-%ifarch x86_64
+%if %{build_libcxx}
 mv libcxx-%{version}.src projects/libcxx
 mv libcxxabi-%{version}.src projects/libcxxabi
 %endif
@@ -358,7 +364,9 @@ ninja %{?_smp_mflags}
 ninja check
 ninja clang-test
 
-%ifarch x86_64
+%if %{build_libcxx}
+# Uncomment when llvm 3.6 hits
+#ninja check-libcxx
 ninja check-libcxxabi
 %endif
 
@@ -450,6 +458,14 @@ mv utils/vim/README utils/vim/README.vim
 # Stuff we don't want to include
 rm %{buildroot}%{_mandir}/man1/lit.1
 
+%if %{build_libcxx}
+# Create an libc++.so as an ldscript
+rm %{buildroot}%{_libdir}/libc++.so
+cat > %{buildroot}%{_libdir}/libc++.so <<EOF
+GROUP ( %{_libdir}/libc++.so.1 %{_libdir}/libc++abi.so )
+EOF
+%endif
+
 %fdupes -s %{buildroot}%{_docdir}/%{name}
 %fdupes -s %{buildroot}%{_docdir}/%{name}-doc
 
@@ -505,7 +521,7 @@ rm %{buildroot}%{_mandir}/man1/lit.1
 %{_datadir}/clang
 %{_mandir}/man1/clang.1%{ext_man}
 %{_libdir}/libLTO.*
-%ifarch x86_64
+%if %{build_libcxx}
 %{_libdir}/libc++*
 %{_includedir}/c++/*
 %endif