diff -Nru policykit-1-0.105/debian/changelog policykit-1-0.105/debian/changelog
--- policykit-1-0.105/debian/changelog	2015-09-08 17:08:57.000000000 +0000
+++ policykit-1-0.105/debian/changelog	2015-10-20 03:40:19.000000000 +0000
@@ -1,3 +1,13 @@
+policykit-1 (0.105-11ubuntu2) wily; urgency=medium
+
+  * debian/policykit-1.{pre,pos}inst: Temporarily mask polkitd.service while
+    policykit-1 is unpackaged but not yet configured. During that time we
+    don't yet have our D-Bus policy in /etc so that polkitd cannot work yet.
+    This can be dropped once the D-Bus policy moves to /usr.
+    (Closes: #794723, LP: #1447654)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 20 Oct 2015 05:37:43 +0200
+
 policykit-1 (0.105-11ubuntu1) wily; urgency=medium
 
   * SECURITY UPDATE: heap corruption via duplicate ids
diff -Nru policykit-1-0.105/debian/policykit-1.postinst policykit-1-0.105/debian/policykit-1.postinst
--- policykit-1-0.105/debian/policykit-1.postinst	2015-07-10 11:03:36.000000000 +0000
+++ policykit-1-0.105/debian/policykit-1.postinst	2015-10-20 03:37:21.000000000 +0000
@@ -47,6 +47,8 @@
 	# Kill the old polkitd daemon on upgrade, to ensure that the new
 	# version will be used at the next occasion.
 	if [ -d /run/systemd/system ]; then
+		# remove the temporary mask from preinst
+		rm -f /run/systemd/system/polkitd.service
 		systemctl daemon-reload
 		deb-systemd-invoke restart polkitd.service || true
 	else
diff -Nru policykit-1-0.105/debian/policykit-1.preinst policykit-1-0.105/debian/policykit-1.preinst
--- policykit-1-0.105/debian/policykit-1.preinst	1970-01-01 00:00:00.000000000 +0000
+++ policykit-1-0.105/debian/policykit-1.preinst	2015-10-20 03:45:28.000000000 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+    install|upgrade)
+        # avoid attempts to start polkitd.service while we are unconfigured and
+        # might not yet have our D-Bus policy in /etc
+        if [ -d /run/systemd/system ]; then
+            ln -s /dev/null /run/systemd/system/polkitd.service
+        fi
+        ;;
+
+    abort-upgrade)
+        rm -f /run/systemd/system/polkitd.service
+        ;;
+esac
+
+#DEBHELPER#