diff --git a/apr-util.spec b/apr-util.spec
index d2ed4df..1becde3 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -16,7 +16,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.6.1
-Release: 2%{?dist}
+Release: 8%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -24,11 +24,14 @@ Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Patch1: apr-util-1.2.7-pkgconf.patch
 Patch4: apr-util-1.4.1-private.patch
 Patch5: apr-util-mariadb-upstream.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: gcc
 BuildRequires: autoconf, apr-devel >= 1.3.0
 BuildRequires: %{dbdep}, expat-devel, libuuid-devel
+Recommends: apr-util-openssl%{_isa} = %{version}-%{release}
 %if 0%{?fedora} < 27
 Requires: apr-util-bdb%{?_isa} = %{version}-%{release}
+%else
+Recommends: apr-util-bdb%{_isa} = %{version}-%{release}
 %endif
 
 %description
@@ -52,7 +55,7 @@ library of C data structures and routines.
 %package pgsql
 Group: Development/Libraries
 Summary: APR utility library PostgreSQL DBD driver
-BuildRequires: postgresql-devel
+BuildRequires: libpq-devel
 Requires: apr-util%{?_isa} = %{version}-%{release}
 
 %description pgsql
@@ -62,7 +65,6 @@ DBD (database abstraction) interface.
 %package bdb
 Group: Development/Libraries
 Summary: APR utility library Berkeley DB driver
-BuildRequires: postgresql-devel
 Requires: apr-util%{?_isa} = %{version}-%{release}
 
 %description bdb
@@ -185,55 +187,42 @@ make %{?_smp_mflags} testall
 export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver}
 ./testall -v -q
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc CHANGES LICENSE NOTICE
 %{_libdir}/libaprutil-%{apuver}.so.*
 %dir %{_libdir}/apr-util-%{apuver}
 
 %files bdb
-%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbm_db*
 
 %files pgsql
-%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_pgsql*
 
 %files mysql
-%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_mysql*
 
 %files sqlite
-%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
 
 %files odbc
-%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_odbc*
 
 %files ldap
-%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_ldap*
 
 %files openssl
-%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_crypto_openssl*
 
 %if %{with_nss}
 %files nss
-%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_crypto_nss*
 %endif
 
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/apu-%{apuver}-config
 %{_libdir}/libaprutil-%{apuver}.*a
 %{_libdir}/libaprutil-%{apuver}.so
@@ -242,6 +231,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Sep 26 2018 Joe Orton <jorton@redhat.com> - 1.6.1-8
+- Recommends: -openssl and -bdb so default crypto, dbm drivers are
+  always available (#1491151, #1633152)
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Mar  9 2018 Bojan Smojver <bojan@rexursive.com> - 1.6.1-6
+- add gcc build requirement
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 26 2018 Florian Weimer <fweimer@redhat.com> - 1.6.1-4
+- Rebuild with new build flags embedded in apr
+
+* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 1.6.1-3
+- Rebuilt for switch to libxcrypt
+
 * Tue Dec 19 2017 Honza Horak <hhorak@redhat.com> - 1.6.1-2
 - Build with mariadb-connector-c