diff --git a/property.te b/property.te
index af7013f4c9526725dc68f2c798dc47ad2430e6ef..2802c0d33a462f91be97ad2d9159ca02a26a6898 100644
--- a/property.te
+++ b/property.te
@@ -13,6 +13,7 @@ type system_radio_prop, property_type, core_property_type;
 type system_prop, property_type, core_property_type;
 type vold_prop, property_type, core_property_type;
 type wifi_log_prop, property_type, log_property_type;
+type wifi_prop, property_type;
 type ctl_bootanim_prop, property_type;
 type ctl_default_prop, property_type;
 type ctl_dumpstate_prop, property_type;
diff --git a/property_contexts b/property_contexts
index 2326fa8070df2bea5692b8250a69835ffca2fb75..5fbb0cd0936f28630030a5705c0b312804ddad8b 100644
--- a/property_contexts
+++ b/property_contexts
@@ -25,7 +25,6 @@ sys.cppreopt            u:object_r:cppreopt_prop:s0
 sys.powerctl            u:object_r:powerctl_prop:s0
 sys.usb.ffs.            u:object_r:ffs_prop:s0
 service.                u:object_r:system_prop:s0
-wlan.                   u:object_r:system_prop:s0
 dhcp.                   u:object_r:dhcp_prop:s0
 dhcp.bt-pan.result      u:object_r:pan_result_prop:s0
 bluetooth.              u:object_r:bluetooth_prop:s0
@@ -95,3 +94,6 @@ config.                 u:object_r:config_prop:s0
 ro.config.              u:object_r:config_prop:s0
 dalvik.                 u:object_r:dalvik_prop:s0
 ro.dalvik.              u:object_r:dalvik_prop:s0
+
+# Shared between system server and wificond
+wlan.                   u:object_r:wifi_prop:s0
diff --git a/system_server.te b/system_server.te
index d74c3cf4fa05f4d8a14a83b41cf2e4376c833aba..a50abe661ebc9d27660d574b586b28a353d58109 100644
--- a/system_server.te
+++ b/system_server.te
@@ -339,6 +339,7 @@ set_prop(system_server, debug_prop)
 set_prop(system_server, powerctl_prop)
 set_prop(system_server, fingerprint_prop)
 set_prop(system_server, device_logging_prop)
+set_prop(system_server, wifi_prop)
 userdebug_or_eng(`set_prop(system_server, wifi_log_prop)')
 
 # ctl interface
diff --git a/wificond.te b/wificond.te
index 2f100dbaecfdb84648f12e1893f30694fb676380..544c9921370a32d458b530f0993444f5afe5858a 100644
--- a/wificond.te
+++ b/wificond.te
@@ -11,3 +11,5 @@ binder_call(wificond, wpa)
 allow wificond wificond_service:service_manager { add find };
 
 allow wificond sysfs_wlan_fwpath:file w_file_perms;
+
+set_prop(wificond, wifi_prop)