diff --git a/pocl.changes b/pocl.changes
index 3ff3557..9f7f7d2 100644
--- a/pocl.changes
+++ b/pocl.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
-Tue May 15 17:39:33 UTC 2018 - mimi.vx@gmail.com
+Tue May 15 20:34:02 UTC 2018 - mimi.vx@gmail.com
 
-- remove lib subpackage - part of libs isnt clearly versioned 
+- move nonversioned lib to main package
 
 -------------------------------------------------------------------
 Fri Mar  9 17:17:10 UTC 2018 - mardnh@gmx.de
diff --git a/pocl.spec b/pocl.spec
index 88ec978..9efedda 100644
--- a/pocl.spec
+++ b/pocl.spec
@@ -31,8 +31,8 @@ URL:            http://portablecl.org/
 #Source0:        http://portablecl.org/downloads/%{name}-%{version}.tar.gz
 Source0:        https://github.com/pocl/pocl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source99:       pocl-rpmlintrc
-BuildRequires:  clang
-BuildRequires:  clang-devel
+BuildRequires:  clang < 7
+BuildRequires:  clang-devel < 7
 BuildRequires:  cmake
 BuildRequires:  libboost_headers-devel
 BuildRequires:  libtool
@@ -45,7 +45,7 @@ BuildRequires:  uthash-devel
 BuildRequires:  pkgconfig(OpenCL)
 BuildRequires:  pkgconfig(glew)
 BuildRequires:  pkgconfig(hwloc)
-Requires:       clang
+Requires:       clang <7
 Requires:       gcc
 Requires:       libstdc++-devel
 Requires:       libut2
@@ -68,10 +68,22 @@ can generate multi-work-item work-group functions that exploit various types of
 parallel hardware resources, such as VLIW, superscalar, SIMD, SIMT, multicore
 and multithread.
 
+%package -n libpocl2
+Summary:        Shared Library part of pocl
+Group:          System/Libraries
+
+%description -n libpocl2
+Portable Computing Language (pocl) is an implementation of the OpenCL standard
+which can be adapted for new targets and devices, both for homogeneous CPU and
+heterogenous GPUs/accelerators.
+
+This subpackage contains the share library part of pocl.
+
 %package devel
 Summary:        Development files for the Portable Computing Language
 Group:          Development/Languages/Other
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libpocl2 = %{version}-%{release}
 Requires:       opencl-headers
 
 %description devel
@@ -116,8 +128,8 @@ sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL
 #cd build
 #ctest
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -n libpocl2 -p /sbin/ldconfig
+%postun -n libpocl2 -p /sbin/ldconfig
 
 %files
 %doc CHANGES README doc/sphinx/source/*.rst
@@ -125,11 +137,13 @@ sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL
 %dir %{_sysconfdir}/OpenCL/vendors
 %{_sysconfdir}/OpenCL/vendors/pocl.icd
 %{_bindir}/poclcc
-%{_datadir}/pocl/
-%{_libdir}/libpocl.so.2
-%{_libdir}/libpocl.so.%{sover}
 %dir %{_libdir}/pocl/
 %{_libdir}/pocl/libllvmopencl.so
+%{_datadir}/pocl/
+
+%files -n libpocl2
+%{_libdir}/libpocl.so.2
+%{_libdir}/libpocl.so.%{sover}
 
 %files devel
 %{_libdir}/libpocl.so