diff --git a/libvirt-rpmlintrc b/libvirt-rpmlintrc
index be4ee7e..498bc74 100644
--- a/libvirt-rpmlintrc
+++ b/libvirt-rpmlintrc
@@ -1 +1,3 @@
 addFilter("shlib-policy-name-error")
+addFilter("missing-dependency-to-logrotate for logrotate script /etc/logrotate.d/libvirtd.(qemu|lxc|uml|libxl)")
+addFilter("incoherent-logrotate-file")
diff --git a/libvirt.changes b/libvirt.changes
index cdd6971..1de210c 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov  8 10:18:44 UTC 2016 - cbosdonnat@suse.com
+
+- Package org.libvirt.api.policy polkit file (bsc#959297)
+- Fix postun systemd services cleanup
+- Mark /etc/libvirt/nwfilter/*.xml files as config files 
+
 -------------------------------------------------------------------
 Wed Nov  2 16:44:57 UTC 2016 - jfehlig@suse.com
 
diff --git a/libvirt.spec b/libvirt.spec
index ee231d3..a21acae 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libvirt
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -1008,8 +1008,6 @@ do
   if test -d $sdir ; then continue ; fi
   rm -rfv "$dir"
 done
-# temporarily remove polkit ACL policiy configuration - bnc#827644
-rm -f $RPM_BUILD_ROOT/%{_datadir}/polkit-1/actions/org.libvirt.api.policy
 
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/libvirt/hooks
@@ -1201,7 +1199,13 @@ fi
 %restart_on_update virtlockd
 %restart_on_update virtlogd
 %endif
-%insserv_cleanup
+%if %{with_systemd}
+   %service_del_postun libvirtd.service
+   %service_del_postun virtlockd.service virtlockd.socket
+   %service_del_postun virtlogd.service virtlogd.socket
+%else
+   %insserv_cleanup
+%endif
 
 %posttrans daemon
 # All connection drivers should be installed post transaction.
@@ -1338,6 +1342,7 @@ fi
 %{_datadir}/polkit-1/rules.d/50-libvirt.rules
 %endif
 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
+%{_datadir}/polkit-1/actions/org.libvirt.api.policy
 %attr(0755, root, root) %{_libdir}/%{name}/libvirt_iohelper
 %doc %{_mandir}/man8/libvirtd.8*
 %doc %{_mandir}/man8/virtlogd.8*
@@ -1362,7 +1367,7 @@ fi
 
 %files daemon-config-nwfilter
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
-%{_sysconfdir}/libvirt/nwfilter/*.xml
+%config %{_sysconfdir}/libvirt/nwfilter/*.xml
 
 %files daemon-driver-interface
 %dir %{_libdir}/%{name}/connection-driver