diff --git a/res/org.freedesktop.miracle.conf b/res/org.freedesktop.miracle.conf
index be09072..4fc2f82 100644
--- a/res/org.freedesktop.miracle.conf
+++ b/res/org.freedesktop.miracle.conf
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!--*-nxml-*-->
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+		"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 
 <!--
   This file is part of MiracleCast.
@@ -8,67 +8,26 @@
 
 <busconfig>
 
-        <policy user="root">
-                <allow own="org.freedesktop.miracle"/>
-                <allow own="org.freedesktop.miracle.wifi"/>
-                <allow own="org.freedesktop.miracle.wfd"/>
-                <allow send_destination="org.freedesktop.miracle"/>
-                <allow send_destination="org.freedesktop.miracle.wifi"/>
-                <allow send_destination="org.freedesktop.miracle.wfd"/>
-                <allow receive_sender="org.freedesktop.miracle"/>
-                <allow receive_sender="org.freedesktop.miracle.wifi"/>
-                <allow receive_sender="org.freedesktop.miracle.wfd"/>
-        </policy>
+		<policy user="root">
+				<allow own="org.freedesktop.miracle"/>
+				<allow own="org.freedesktop.miracle.wifi"/>
+				<allow own="org.freedesktop.miracle.wfd"/>
+				<allow send_destination="org.freedesktop.miracle"/>
+				<allow send_destination="org.freedesktop.miracle.wifi"/>
+				<allow send_destination="org.freedesktop.miracle.wfd"/>
+				<allow receive_sender="org.freedesktop.miracle"/>
+				<allow receive_sender="org.freedesktop.miracle.wifi"/>
+				<allow receive_sender="org.freedesktop.miracle.wfd"/>
+		</policy>
 
-        <policy context="default">
-                <deny send_destination="org.freedesktop.miracle"/>
-                <deny send_destination="org.freedesktop.miracle.wifi"/>
-                <deny send_destination="org.freedesktop.miracle.wfd"/>
+		<policy context="default">
+				<allow send_destination="org.freedesktop.miracle"/>
+				<allow send_destination="org.freedesktop.miracle.wifi"/>
+				<allow send_destination="org.freedesktop.miracle.wfd"/>
 
-                <allow send_destination="org.freedesktop.miracle"
-                       send_interface="org.freedesktop.DBus.Introspectable"/>
-                <allow send_destination="org.freedesktop.miracle.wifi"
-                       send_interface="org.freedesktop.DBus.Introspectable"/>
-                <allow send_destination="org.freedesktop.miracle.wfd"
-                       send_interface="org.freedesktop.DBus.Introspectable"/>
-
-                <allow send_destination="org.freedesktop.miracle"
-                       send_interface="org.freedesktop.DBus.Peer"/>
-                <allow send_destination="org.freedesktop.miracle.wifi"
-                       send_interface="org.freedesktop.DBus.Peer"/>
-                <allow send_destination="org.freedesktop.miracle.wfd"
-                       send_interface="org.freedesktop.DBus.Peer"/>
-
-                <allow send_destination="org.freedesktop.miracle"
-                       send_interface="org.freedesktop.DBus.ObjectManager"/>
-                <allow send_destination="org.freedesktop.miracle.wifi"
-                       send_interface="org.freedesktop.DBus.ObjectManager"/>
-                <allow send_destination="org.freedesktop.miracle.wfd"
-                       send_interface="org.freedesktop.DBus.ObjectManager"/>
-
-                <allow send_destination="org.freedesktop.miracle"
-                       send_interface="org.freedesktop.DBus.Properties"
-                       send_member="Get"/>
-                <allow send_destination="org.freedesktop.miracle.wifi"
-                       send_interface="org.freedesktop.DBus.Properties"
-                       send_member="Get"/>
-                <allow send_destination="org.freedesktop.miracle.wfd"
-                       send_interface="org.freedesktop.DBus.Properties"
-                       send_member="Get"/>
-
-                <allow send_destination="org.freedesktop.miracle"
-                       send_interface="org.freedesktop.DBus.Properties"
-                       send_member="GetAll"/>
-                <allow send_destination="org.freedesktop.miracle.wifi"
-                       send_interface="org.freedesktop.DBus.Properties"
-                       send_member="GetAll"/>
-                <allow send_destination="org.freedesktop.miracle.wfd"
-                       send_interface="org.freedesktop.DBus.Properties"
-                       send_member="GetAll"/>
-
-                <allow receive_sender="org.freedesktop.miracle"/>
-                <allow receive_sender="org.freedesktop.miracle.wifi"/>
-                <allow receive_sender="org.freedesktop.miracle.wfd"/>
-        </policy>
+				<allow receive_sender="org.freedesktop.miracle"/>
+				<allow receive_sender="org.freedesktop.miracle.wifi"/>
+				<allow receive_sender="org.freedesktop.miracle.wfd"/>
+		</policy>
 
 </busconfig>
diff --git a/src/ctl/wfd-dbus.c b/src/ctl/wfd-dbus.c
index 49e9470..d5030b0 100644
--- a/src/ctl/wfd-dbus.c
+++ b/src/ctl/wfd-dbus.c
@@ -622,7 +622,7 @@ static const sd_bus_vtable wfd_dbus_vtable[] = {
 
 static const sd_bus_vtable wfd_dbus_sink_vtable[] = {
 	SD_BUS_VTABLE_START(0),
-	SD_BUS_METHOD("StartSession", "sqqqq", "o", wfd_dbus_sink_start_session, 0),
+	SD_BUS_METHOD("StartSession", "sqqqq", "o", wfd_dbus_sink_start_session, SD_BUS_VTABLE_UNPRIVILEGED),
 	/*SD_BUS_PROPERTY("AudioFormats", "a{sv}", wfd_dbus_sink_get_audio_formats, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/
 	/*SD_BUS_PROPERTY("VideoFormats", "a{sv}", wfd_dbus_sink_get_video_formats, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/
 	/*SD_BUS_PROPERTY("HasAudio", "b", wfd_dbus_sink_has_audio, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/
@@ -634,9 +634,9 @@ static const sd_bus_vtable wfd_dbus_sink_vtable[] = {
 
 static const sd_bus_vtable wfd_dbus_session_vtable[] = {
 	SD_BUS_VTABLE_START(0),
-	SD_BUS_METHOD("Resume", NULL, NULL, wfd_dbus_session_resume, 0),
-	SD_BUS_METHOD("Pause", NULL, NULL, wfd_dbus_session_pause, 0),
-	SD_BUS_METHOD("Teardown", NULL, NULL, wfd_dbus_session_teardown, 0),
+	SD_BUS_METHOD("Resume", NULL, NULL, wfd_dbus_session_resume, SD_BUS_VTABLE_UNPRIVILEGED),
+	SD_BUS_METHOD("Pause", NULL, NULL, wfd_dbus_session_pause, SD_BUS_VTABLE_UNPRIVILEGED),
+	SD_BUS_METHOD("Teardown", NULL, NULL, wfd_dbus_session_teardown, SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_PROPERTY("Sink", "o", wfd_dbus_session_get_sink, 0, SD_BUS_VTABLE_PROPERTY_CONST),
 	SD_BUS_PROPERTY("Url", "o", wfd_dbus_get_session_presentation_url, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
 	SD_BUS_PROPERTY("State", "i", wfd_dbus_get_session_state, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
diff --git a/src/wifi/wifid-dbus.c b/src/wifi/wifid-dbus.c
index ebb17ca..94c3dda 100644
--- a/src/wifi/wifid-dbus.c
+++ b/src/wifi/wifid-dbus.c
@@ -261,12 +261,12 @@ static const sd_bus_vtable peer_dbus_vtable[] = {
 		      "ss",
 		      NULL,
 		      peer_dbus_connect,
-		      0),
+		      SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_METHOD("Disconnect",
 		      NULL,
 		      NULL,
 		      peer_dbus_disconnect,
-		      0),
+		      SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_PROPERTY("Link",
 			"o",
 			peer_dbus_get_link,
@@ -719,25 +719,25 @@ static const sd_bus_vtable link_dbus_vtable[] = {
 				 link_dbus_get_friendly_name,
 				 link_dbus_set_friendly_name,
 				 0,
-				 SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+				 SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE | SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_WRITABLE_PROPERTY("Managed",
 				 "b",
 				 link_dbus_get_managed,
 				 link_dbus_set_managed,
 				 0,
-				 SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+				 SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE | SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_WRITABLE_PROPERTY("P2PScanning",
 				 "b",
 				 link_dbus_get_p2p_scanning,
 				 link_dbus_set_p2p_scanning,
 				 0,
-				 SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+				 SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE | SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_WRITABLE_PROPERTY("WfdSubelements",
 				 "s",
 				 link_dbus_get_wfd_subelements,
 				 link_dbus_set_wfd_subelements,
 				 0,
-				 SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+				 SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE | SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_VTABLE_END
 };