diff --git a/policy/Makefile.am b/policy/Makefile.am
index c5d24764e..17fc56dc5 100644
--- a/policy/Makefile.am
+++ b/policy/Makefile.am
@@ -1,4 +1,4 @@
-polkit_policydir = $(datadir)/PolicyKit/policy
+polkit_policydir = $(datadir)/polkit-1/actions
 
 dist_polkit_policy_in_files = org.freedesktop.network-manager-settings.system.policy.in
 dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
diff --git a/policy/org.freedesktop.network-manager-settings.system.policy.in b/policy/org.freedesktop.network-manager-settings.system.policy.in
index ca8c14bf3..8b24a23b1 100644
--- a/policy/org.freedesktop.network-manager-settings.system.policy.in
+++ b/policy/org.freedesktop.network-manager-settings.system.policy.in
@@ -14,7 +14,7 @@
     <_message>System policy prevents modification of system settings</_message>
     <defaults>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep_always</allow_active>
+      <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>