diff --git a/libaccounts-glib.spec b/libaccounts-glib.spec
index 1acc1bd..6855c18 100644
--- a/libaccounts-glib.spec
+++ b/libaccounts-glib.spec
@@ -1,7 +1,6 @@
 Name:		libaccounts-glib
 Version:	1.18
-Release:	2%{?dist}
-Group:		System Environment/Libraries
+Release:	3%{?dist}
 Summary:	Accounts framework for Linux and POSIX based platforms
 License:	LGPLv2
 URL:        https://gitlab.com/accounts-sso/libaccounts-glib
@@ -22,9 +21,7 @@ BuildRequires:	gtk-doc
 
 %package devel
 Summary:	Development files for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains libraries and header files for
@@ -54,6 +51,9 @@ make install DESTDIR=%{buildroot}
 
 rm -f %{buildroot}%{_libdir}/*.la
 
+# create/own data dirs
+mkdir -p %{buildroot}%{_datadir}/accounts/{applications,providers,services,service_types}
+
 # add docs manuall to %%doc instead
 rm -rf %{buildroot}%{_prefix}/doc/reference
 
@@ -75,23 +75,27 @@ rm -rf %{buildroot}%{_datadir}/libaccounts-glib0-test
 %dir %{_datadir}/backup-framework
 %dir %{_datadir}/backup-framework/applications
 %{_datadir}/backup-framework/applications/*.conf
-%{_libdir}/%{name}.so.*
+%{_libdir}/libaccounts-glib.so.0*
 %{_libdir}/girepository-1.0/Accounts-1.0.typelib
 %dir %{_datadir}/xml/
 %dir %{_datadir}/xml/accounts/
 %dir %{_datadir}/xml/accounts/schema/
 %dir %{_datadir}/xml/accounts/schema/dtd
 %{_datadir}/xml/accounts/schema/dtd/accounts-*.dtd
+%dir %{_datadir}/accounts/
+%dir %{_datadir}/accounts/applications/
+%dir %{_datadir}/accounts/providers/
+%dir %{_datadir}/accounts/services/
+%dir %{_datadir}/accounts/service_types/
 
 %files devel
-%defattr(-,root,root,-)
-%{_libdir}/%{name}.so
-%{_libdir}/pkgconfig/%{name}.pc
-%{_includedir}/%{name}
+%{_libdir}/libaccounts-glib.so
+%{_libdir}/pkgconfig/libaccounts-glib.pc
+%{_includedir}/libaccounts-glib
 %{_datadir}/gir-1.0/Accounts-1.0.gir
-%{_libdir}/libaccounts-glib
+%{_libdir}/libaccounts-glib/
 %{_datadir}/dbus-1/interfaces/*.xml
-%{_datadir}/libaccounts-glib
+%{_datadir}/libaccounts-glib/
 %{_datadir}/vala/vapi/libaccounts-glib.deps
 %{_datadir}/vala/vapi/libaccounts-glib.vapi
 
@@ -99,6 +103,12 @@ rm -rf %{buildroot}%{_datadir}/libaccounts-glib0-test
 %doc %{_datadir}/gtk-doc/html/libaccounts-glib/
 
 %changelog
+* Mon Sep 28 2015 Rex Dieter <rdieter@fedoraproject.org> - 1.18-3
+- tighten subpkg dependencies
+- -devel: drop hard-coded glib2 dep (pkgconfig auto deps handles it)
+- .spec cosmetics
+- own %%_datadir/accounts (and children)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild