diff --git a/baselibs.conf b/baselibs.conf
index de8a8d0..3df1296 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1 @@
-llvm-devel
+libLLVM
diff --git a/llvm.changes b/llvm.changes
index 9d47626..35eb83f 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul  3 13:13:25 UTC 2013 - idonmez@suse.com
+
+- Create libLLVM and libclang subpackages.
+
 -------------------------------------------------------------------
 Wed Jun 19 12:58:24 UTC 2013 - llunak@suse.com
 
@@ -6,7 +11,7 @@ Wed Jun 19 12:58:24 UTC 2013 - llunak@suse.com
 -------------------------------------------------------------------
 Wed Jun 19 12:41:30 UTC 2013 - idonmez@suse.com
 
-- Fix ARM v5/v7 builds 
+- Fix ARM v5/v7 builds
 
 -------------------------------------------------------------------
 Tue Jun 18 13:42:57 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
diff --git a/llvm.spec b/llvm.spec
index d63d8e9..c9fa125 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -65,6 +65,7 @@ BuildRequires:  groff
 BuildRequires:  libffi-devel
 BuildRequires:  libtool
 BuildRequires:  python-base
+Requires:       libLLVM = %{version}-%{release}
 # llvm does not work on ppc, only ppc64
 ExcludeArch:    ppc
 
@@ -76,8 +77,15 @@ arbitrary programming languages.
 The compiler infrastructure includes mirror sets of programming
 tools as well as libraries with equivalent functionality.
 
+%package -n libLLVM
+Summary:        Libraries for LLVM
+Group:          Development/Libraries/C and C++
+
+%description -n libLLVM
+This package contains the shared libraries needed for LLVM.
+
 %package devel
-Summary:        Libraries and Header Files for LLVM
+Summary:        Header Files for LLVM
 Group:          Development/Languages/Other
 Requires:       %{name} = %{version}
 Requires:       libffi-devel
@@ -102,12 +110,20 @@ Summary:        CLANG frontend for LLVM
 Group:          Development/Languages/Other
 Requires:       %{name} = %{version}
 Requires:       binutils
+Requires:       libclang = %{version}-%{release}
 Requires:       libstdc++-devel
 Provides:       clang
 
 %description clang
 This package contains the clang (C language) frontend for LLVM.
 
+%package -n libclang
+Summary:        Library files needed for clang
+Group:          Development/Libraries/C and C++
+
+%description -n libclang
+This package contains the shared libraries needed for clang.
+
 %package clang-devel
 Summary:        CLANG frontend for LLVM (devel package)
 Group:          Development/Languages/Other
@@ -332,12 +348,13 @@ rm -rf %{buildroot}/usr/share/llvm/cmake
 %fdupes -s %{buildroot}%{_docdir}/%{name}
 %fdupes -s %{buildroot}%{_docdir}/%{name}-doc
 
-%post clang -p /sbin/ldconfig
+%post -n libLLVM -p /sbin/ldconfig
+%postun -n libLLVM -p /sbin/ldconfig
 
-%postun clang -p /sbin/ldconfig
+%post -n libclang -p /sbin/ldconfig
+%postun -n libclang -p /sbin/ldconfig
 
 %post clang-devel -p /sbin/ldconfig
-
 %postun clang-devel -p /sbin/ldconfig
 
 %files
@@ -358,6 +375,10 @@ rm -rf %{buildroot}/usr/share/llvm/cmake
 %{_mandir}/man1/FileCheck.1%{ext_man}
 %{_mandir}/man1/opt.1%{ext_man}
 
+%files -n libLLVM
+%defattr(-,root,root,-)
+%{_libdir}/libLLVM*
+
 %files clang
 %defattr(-,root,root)
 %{_bindir}/clang
@@ -374,8 +395,6 @@ rm -rf %{buildroot}/usr/share/llvm/cmake
 %{py_sitedir}/Resources
 %{_datadir}/clang
 %{_mandir}/man1/clang.1%{ext_man}
-%{_libdir}/libclang*.so
-%{_libdir}/libclang.so*
 %{_libdir}/libLTO.so
 %{_libdir}/libprofile_rt.so
 %if 0%{?suse_version} >= 1220
@@ -385,8 +404,15 @@ rm -rf %{buildroot}/usr/share/llvm/cmake
 %{_libdir}/clang
 %{_libdir}/clang/%{_release_version}/lib/linux/
 
+%files -n libclang
+%defattr(-,root,root,-)
+%exclude %{_libdir}/libclang.so
+%{_libdir}/libclang*.so
+%{_libdir}/libclang.so.*
+
 %files clang-devel
 %defattr(-,root,root)
+%{_libdir}/libclang.so
 %{_includedir}/clang
 %{_includedir}/clang-c
 %doc %{_docdir}/llvm-clang
@@ -397,7 +423,6 @@ rm -rf %{buildroot}/usr/share/llvm/cmake
 %doc %{_mandir}/man1/%{name}-config.1%{ext_man}
 %{_includedir}/%{name}/
 %{_includedir}/%{name}-c/
-%{_libdir}/libLLVM*
 %doc %{_docdir}/%{name}
 
 %files vim-plugins