diff --git a/llvm.spec b/llvm.spec
index cb65824..27e4df4 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -12,7 +12,7 @@
 
 Name:           llvm
 Version:        2.8
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -42,6 +42,7 @@ BuildRequires:  dejagnu tcl-devel python
 %if 0%{?_with_doxygen}
 BuildRequires:  doxygen graphviz
 %endif
+Requires:       llvm-libs = %{version}-%{release}
 
 # LLVM is not supported on PPC64
 # http://llvm.org/bugs/show_bug.cgi?id=3729
@@ -81,10 +82,19 @@ Obsoletes:      %{name}-doc < %{version}-%{release}
 Documentation for the LLVM compiler infrastructure.
 
 
+%package libs
+Summary:        LLVM shared libraries
+Group:          System Environment/Libraries
+
+%description libs
+Shared libraries for the LLVM compiler infrastructure.
+
+
 %package -n clang
 Summary:        A C language family front-end for LLVM
 License:        NCSA
 Group:          Development/Languages
+Requires:       llvm = %{version}-%{release}
 # clang requires gcc; clang++ gcc-c++
 Requires:       gcc-c++
 
@@ -309,24 +319,23 @@ chmod -x %{buildroot}%{_libdir}/%{name}/*.a
 find examples -name 'Makefile' | xargs -0r rm -f
 
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%post -n clang -p /sbin/ldconfig
 
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%postun -n clang -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
-%doc CREDITS.TXT LICENSE.TXT README.txt llvm-testlog.txt
+%doc CREDITS.TXT LICENSE.TXT README.txt
 %{_bindir}/bugpoint
 %{_bindir}/llc
 %{_bindir}/lli
 %exclude %{_bindir}/llvm-config
 %{_bindir}/llvm*
 %{_bindir}/opt
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf
-%dir %{_libdir}/llvm
-%{_libdir}/llvm/*.so
 %exclude %{_mandir}/man1/clang.1.*
 %exclude %{_mandir}/man1/llvmg??.1.*
 %doc %{_mandir}/man1/*.1.*
@@ -338,12 +347,20 @@ find examples -name 'Makefile' | xargs -0r rm -f
 %{_includedir}/%{name}-c
 %{_libdir}/%{name}/*.a
 
+%files libs
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf
+%dir %{_libdir}/%{name}
+%exclude %{_libdir}/%{name}/libclang.so
+%{_libdir}/%{name}/*.so
+
 %files -n clang
 %defattr(-,root,root,-)
-%doc clang-docs/* clang-testlog.txt
+%doc clang-docs/*
 %{_bindir}/clang*
 %{_bindir}/c-index-test
 %{_bindir}/tblgen
+%{_libdir}/%{name}/libclang.so
 %{_prefix}/lib/clang
 %doc %{_mandir}/man1/clang.1.*
 
@@ -395,6 +412,10 @@ find examples -name 'Makefile' | xargs -0r rm -f
 
 
 %changelog
+* Thu Mar 17 2011 Michel Salim <salimma@fedoraproject.org> - 2.8-10
+- Don't include test logs; breaks multilib (# 666195)
+- Split shared libraries into separate subpackage
+
 * Thu Mar 17 2011 Michel Salim <salimma@fedoraproject.org> - 2.8-9
 - clang++: fix platform-specific include dirs (# 680644)