diff --git a/kea.spec b/kea.spec
index 7e8cb46..70b8efe 100644
--- a/kea.spec
+++ b/kea.spec
@@ -124,6 +124,13 @@ Group:          System/Libraries
 The Kea cryptolink library is an abstraction layer for crypto
 library backends (such as Botan, OpenSSL).
 
+%package -n libkea-database1
+Summary:        Kea database abstraction library
+Group:          System/Library
+
+%description -n libkea-database1
+Kea's database abstraction library.
+
 %package -n libkea-dhcp++11
 Summary:        Kea DHCP library
 Group:          System/Libraries
@@ -213,6 +220,20 @@ log4J logging system common in Java development, and includes the
 following ideas: a set of severity levels; a hierarchy of logging
 sources; separation of message use from message text.
 
+%package -n libkea-mysql0
+Summary:        Kea MySQL database library
+Group:          System/Library
+
+%description -n libkea-mysql0
+Kea's database library for MySQL.
+
+%package -n libkea-pgsql0
+Summary:        Kea PostgreSQL database library
+Group:          System/Library
+
+%description -n libkea-pgsql0
+Kea's database library for PostgreSQL.
+
 %package -n libkea-process3
 Summary:        Kea DHCP process abstraction library
 Group:          System/Libraries
@@ -248,27 +269,6 @@ Group:          System/Library
 %description -n libkea-util5
 One of the many libraries the Kea DHCP server is composed of.
 
-%package -n libkea-database1
-Summary:        Kea database abstraction library
-Group:          System/Library
-
-%description -n libkea-database1
-Kea's database abstraction library.
-
-%package -n libkea-mysql0
-Summary:        Kea MySQL database library
-Group:          System/Library
-
-%description -n libkea-mysql0
-Kea's database library for MySQL.
-
-%package -n libkea-pgsql0
-Summary:        Kea PostgreSQL database library
-Group:          System/Library
-
-%description -n libkea-pgsql0
-Kea's database library for PostgreSQL.
-
 %package devel
 Summary:        Development files for the Kea DHCP server
 Group:          Development/Libraries/C and C++
@@ -277,6 +277,7 @@ Requires:       libkea-asiolink7 = %version
 Requires:       libkea-cc7 = %version
 Requires:       libkea-cfgclient6 = %version
 Requires:       libkea-cryptolink4 = %version
+Requires:       libkea-database1 = %version
 Requires:       libkea-dhcp++11 = %version
 Requires:       libkea-dhcp_ddns1 = %version
 Requires:       libkea-dhcpsrv14 = %version
@@ -286,14 +287,13 @@ Requires:       libkea-exceptions0 = %version
 Requires:       libkea-hooks7 = %version
 Requires:       libkea-http4 = %version
 Requires:       libkea-log3 = %version
+Requires:       libkea-mysql0 = %version
+Requires:       libkea-pgsql0 = %version
 Requires:       libkea-process3 = %version
 Requires:       libkea-stats2 = %version
 Requires:       libkea-threads2 = %version
 Requires:       libkea-util-io0 = %version
 Requires:       libkea-util5 = %version
-Requires:       libkea-database1 = %version
-Requires:       libkea-mysql0 = %version
-Requires:       libkea-pgsql0 = %version
 # Bundy DHCP and Kea share the same origin, so conflict
 Conflicts:      otheproviders(pkgconfig(dns++))
 
@@ -373,6 +373,8 @@ systemd-tmpfiles --create kea.conf || :
 %postun -n libkea-cfgclient6 -p /sbin/ldconfig
 %post   -n libkea-cryptolink4 -p /sbin/ldconfig
 %postun -n libkea-cryptolink4 -p /sbin/ldconfig
+%post   -n libkea-database1 -p /sbin/ldconfig
+%postun -n libkea-database1 -p /sbin/ldconfig
 %post   -n libkea-dhcp++11 -p /sbin/ldconfig
 %postun -n libkea-dhcp++11 -p /sbin/ldconfig
 %post   -n libkea-dhcp_ddns1 -p /sbin/ldconfig
@@ -391,6 +393,10 @@ systemd-tmpfiles --create kea.conf || :
 %postun -n libkea-http4 -p /sbin/ldconfig
 %post   -n libkea-log3 -p /sbin/ldconfig
 %postun -n libkea-log3 -p /sbin/ldconfig
+%post   -n libkea-mysql0 -p /sbin/ldconfig
+%postun -n libkea-mysql0 -p /sbin/ldconfig
+%post   -n libkea-pgsql0 -p /sbin/ldconfig
+%postun -n libkea-pgsql0 -p /sbin/ldconfig
 %post   -n libkea-process3 -p /sbin/ldconfig
 %postun -n libkea-process3 -p /sbin/ldconfig
 %post   -n libkea-stats2 -p /sbin/ldconfig
@@ -401,18 +407,12 @@ systemd-tmpfiles --create kea.conf || :
 %postun -n libkea-util-io0 -p /sbin/ldconfig
 %post   -n libkea-util5 -p /sbin/ldconfig
 %postun -n libkea-util5 -p /sbin/ldconfig
-%post   -n libkea-database1 -p /sbin/ldconfig
-%postun -n libkea-database1 -p /sbin/ldconfig
-%post   -n libkea-mysql0 -p /sbin/ldconfig
-%postun -n libkea-mysql0 -p /sbin/ldconfig
-%post   -n libkea-pgsql0 -p /sbin/ldconfig
-%postun -n libkea-pgsql0 -p /sbin/ldconfig
 
 %files
 %dir %_sysconfdir/kea
 %config(noreplace) %_sysconfdir/kea/*.conf
 %_datadir/doc/kea/
-%_mandir/man8/*.8%{?ext_man}
+%_mandir/man8/*.8*
 %_bindir/kea*
 %_sbindir/rckea
 %_sbindir/kea*
@@ -444,6 +444,9 @@ systemd-tmpfiles --create kea.conf || :
 %files -n libkea-cryptolink4
 %_libdir/libkea-cryptolink.so.4*
 
+%files -n libkea-database1
+%_libdir/libkea-database.so.1*
+
 %files -n libkea-dhcp++11
 %_libdir/libkea-dhcp++.so.11*
 
@@ -471,12 +474,18 @@ systemd-tmpfiles --create kea.conf || :
 %files -n libkea-log3
 %_libdir/libkea-log.so.3*
 
-%files -n libkea-stats2
-%_libdir/libkea-stats.so.2*
+%files -n libkea-mysql0
+%_libdir/libkea-mysql.so.0*
+
+%files -n libkea-pgsql0
+%_libdir/libkea-pgsql.so.0*
 
 %files -n libkea-process3
 %_libdir/libkea-process.so.3*
 
+%files -n libkea-stats2
+%_libdir/libkea-stats.so.2*
+
 %files -n libkea-threads2
 %_libdir/libkea-threads.so.2*
 
@@ -486,15 +495,6 @@ systemd-tmpfiles --create kea.conf || :
 %files -n libkea-util5
 %_libdir/libkea-util.so.5*
 
-%files -n libkea-database1
-%_libdir/libkea-database.so.1*
-
-%files -n libkea-mysql0
-%_libdir/libkea-mysql.so.0*
-
-%files -n libkea-pgsql0
-%_libdir/libkea-pgsql.so.0*
-
 %files devel
 %_includedir/kea/
 %_libdir/pkgconfig/*.pc