diff --git a/selinux-policy.spec b/selinux-policy.spec
index 5478def..7703991 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -24,7 +24,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 34.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Source: %{giturl}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 Source1: modules-targeted-base.conf
@@ -285,6 +285,8 @@ if %{_sbindir}/selinuxenabled && [ "${SELINUXTYPE}" = %1 -a -f ${FILE_CONTEXT}.p
      %{_sbindir}/fixfiles -C ${FILE_CONTEXT}.pre restore &> /dev/null > /dev/null; \
      rm -f ${FILE_CONTEXT}.pre; \
 fi; \
+# rebuilding the rpm database still can sometimes result in an incorrect context
+%{_sbindir}/restorecon -R /var/lib/rpm \
 if %{_sbindir}/restorecon -e /run/media -R /root /var/log /var/run /etc/passwd* /etc/group* /etc/*shadow* 2> /dev/null;then \
     continue; \
 fi;
@@ -806,6 +808,10 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 27 2021 Zdenek Pytela <zpytela@redhat.com> - 34.17-2
+- Relabel /var/lib/rpm explicitly
+- Revert "Relabel /dev/dma_heap explicitly"
+
 * Fri Aug 27 2021 Zdenek Pytela <zpytela@redhat.com> - 34.17-1
 - Add support for at-spi
 - Add permissions for system dbus processes