diff --git a/cube.spec b/cube.spec
index 5adb34d..a450a28 100644
--- a/cube.spec
+++ b/cube.spec
@@ -42,20 +42,39 @@ behavior.
 
 
 %package        libs
-Summary:        Libraries for %{name}
+Summary:        Non-GUI libraries for %{name}
 
 %description    libs
-Libraries required by %{name}
+Non-GUI libraries required by %{name}
+
+%package  	libs-devel
+Summary:	Development files for %{name}-libs
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description	libs-devel
+Development files for %{name}-libs.
+
+%package        guilib
+Summary:        GUI library for %{name}
+
+%description    guilib
+GUI library for %{name}.
+
+%package  	guilib-devel
+Summary:	Development files for %{name}-guilib
+Requires:       %{name}-guilib%{?_isa} = %{version}-%{release}
+
+%description	guilib-devel
+Development files for %{name}-guilib.
 
 %package        devel
 Summary:        Development files for %{name}
-# cube-devel may be required by profiling packages on compute nodes,
-# so don't require cube, to avoid graphics
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs-devel = %{version}-%{release}
+Requires:	%{name}-guilib-devel = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+developing applications that use %{name}, including GUI applications.
 
 
 %package        doc
@@ -110,7 +129,6 @@ make install DESTDIR=$(pwd)/inst
 # Wrong paths in .la cause trouble
 rm inst%_libdir/*.la
 cd ../cubegui-%version
-# We can't use --with-scorep without it installed
 %configure --disable-static \
   --disable-silent-rules \
   --with-platform=linux \
@@ -192,8 +210,8 @@ chrpath -d -k %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/{,cube-plugins/}*.
 cat <<EOF >CUBE.desktop
 [Desktop Entry]
 Comment=Performance profile browser CUBE
-Exec=/usr/bin/cube
-Icon=/usr/share/icons/cubegui/Cube.xpm
+Exec=%_bindir/cube
+Icon=%_datadir/icons/cubegui/Cube.xpm
 InitialPreference=3
 MimeType=application/cube;
 Name=Cube (scalasca.org)
@@ -216,12 +234,10 @@ make -C cubew-%cubew_vers check || { cat test/test*/*log && false; }
 
 
 %post
-/sbin/ldconfig
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 /usr/bin/update-desktop-database &> /dev/null || :
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -231,9 +247,9 @@ fi
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%post libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets guilib
 
-%postun libs -p /sbin/ldconfig
 
 %files
 %license cubegui-%version/COPYING
@@ -271,7 +287,6 @@ fi
 %{_bindir}/cube_topoassist
 %{_bindir}/tau2cube
 %{_libdir}/libgraphwidgetcommon-plugin.so.7*
-%{_libdir}/lib%{name}4gui*.so.7*
 %{_libdir}/cube-plugins/
 %{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/CUBE.desktop
@@ -279,31 +294,45 @@ fi
 %{_datadir}/cubegui/
 
 %files libs
+%license cubegui-%version/COPYING
 %{_bindir}/cube_server
-%exclude %{_libdir}/lib%{name}4gui*.so*
+%exclude %{_libdir}/lib%{name}4gui*.so.7*
+%{_libdir}/lib%{name}4gui*.so
 %{_libdir}/lib%{name}*.so.7*
 %{_libdir}/lib%{name}.tools*.so.0*
 %{_datadir}/cubelib/
 %{_datadir}/cubew/
 
-%files devel
-%{_bindir}/cubegui-config
+%files libs-devel
 %{_bindir}/cubelib-config
 %{_bindir}/cubew-config
-%{_includedir}/%{name}*/
+%{_includedir}/cubew
+%{_includedir}/cubelib
 %{_libdir}/lib%{name}*.so
 %{_libdir}/libgraphwidgetcommon-plugin.so
 %doc cubegui-%version/examples
 
+%files guilib
+%license cubegui-%version/COPYING
+%{_libdir}/lib%{name}4gui.so.7*
+
+%files guilib-devel
+%{_bindir}/cubegui-config
+%{_includedir}/cubegui
+%{_libdir}/lib%{name}4gui.so
+
 %files doc
+%license cubegui-%version/COPYING
 %doc %_docdir/cubew
 %doc %_docdir/cubelib
 %doc %_docdir/cubegui
 
 
 %changelog
-* Sat Dec  1 2018 Dave Love <loveshack@fedoraproject.org> - 4.4.2-2
+* Mon Dec  3 2018 Dave Love <loveshack@fedoraproject.org> - 4.4.2-2
 - Adapt to el8, with qt5
+- Add guilib{,-devel} sub-packages really to separate GUI dependency
+- Add missing license files
 
 * Mon Oct 22 2018 Dave Love <loveshack@fedoraproject.org> - 4.4.2-1
 - Update to cubew 4.4.1, cubelib and cubeGUI 4.4.2