diff --git a/polkit-default-privs.changes b/polkit-default-privs.changes
index 2fde1e0..2e3a194 100644
--- a/polkit-default-privs.changes
+++ b/polkit-default-privs.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Nov 19 13:57:09 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Change Requires: polkit to Requires(pre): we need to be sure
+  polkit is instaled first, as we could otherwise end up with wrong
+  permissions on /etc/polkit-1/rules.d.
+
+-------------------------------------------------------------------
+Fri Nov 19 09:43:34 UTC 2021 - Matthias Gerstner <matthias.gerstner@suse.com>
+
+- remove traces of old polkit-whitelisting sub-package
+
 -------------------------------------------------------------------
 Fri Oct  8 09:28:28 UTC 2021 - Matthias Gerstner <matthias.gerstner@suse.com>
 
diff --git a/polkit-default-privs.spec b/polkit-default-privs.spec
index 7b7356d..3721faa 100644
--- a/polkit-default-privs.spec
+++ b/polkit-default-privs.spec
@@ -30,10 +30,10 @@ License:        GPL-2.0-or-later
 Group:          Productivity/Security
 Source:         polkit-default-privs-%version.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  polkit
-Requires:       polkit
 Supplements:    PolicyKit
 Supplements:    libpolkit0
+BuildRequires:  polkit
+Requires(pre):  polkit
 Supplements:    polkit
 BuildArch:      noarch
 # please open bugreports at bugzilla.suse.com
@@ -45,18 +45,6 @@ Predefined polkit profiles for different usage scenarios like desktop and
 server. These profiles define the kind of authentication required for various
 polkit actions used across applications.
 
-# use a separate package for the static whitelist (i.e. the one that isn't
-# part of the different profiles selectable during runtime). This whitelist is
-# of no use for users and only needed during rpmlint time.
-%package -n polkit-whitelisting
-Summary:        Static polkit whitelists for processing by rpmlint-checks
-Group:          Productivity/Security
-
-%description -n polkit-whitelisting
-This package contains static polkit whitelistings for polkit Java Script rule
-files. The whitelistings will be processed by rpmlint-checks to determine
-valid rule file installations by other packages.
-
 %prep
 %setup -q
 
@@ -74,8 +62,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/polkit-1/rules.d/
 %files
 %define basedir %{_distconfdir}/polkit-default-privs
 %define profiledir %{basedir}/profiles
+%define confdir /etc/polkit-1
 %doc README.md
-%ghost %attr(0644,root,root) /etc/polkit-1/rules.d/90-default-privs.rules
+%ghost %attr(0644,root,root) %{confdir}/rules.d/90-default-privs.rules
 %dir %{basedir}
 %dir %{profiledir}
 %{profiledir}/easy