diff --git a/property.te b/property.te
index d0c77a47e1cf210f02d78ce39d9f4c727be11567..55888d1151f4d844f54b8a1f845486c8177c0bef 100644
--- a/property.te
+++ b/property.te
@@ -1,5 +1,6 @@
 type default_prop, property_type;
 type shell_prop, property_type;
+type debug_prop, property_type;
 type radio_prop, property_type;
 type system_prop, property_type;
 type vold_prop, property_type;
diff --git a/property_contexts b/property_contexts
index 6c47c9fc0b029dc39b7da1aa7099b00c20ae0aec..75c927f58b641427c5c13787792790455c83983e 100644
--- a/property_contexts
+++ b/property_contexts
@@ -26,7 +26,7 @@ wlan.                   u:object_r:system_prop:s0
 dhcp.                   u:object_r:system_prop:s0
 bluetooth.              u:object_r:bluetooth_prop:s0
 
-debug.                  u:object_r:shell_prop:s0
+debug.                  u:object_r:debug_prop:s0
 log.                    u:object_r:shell_prop:s0
 service.adb.root        u:object_r:shell_prop:s0
 service.adb.tcp.port    u:object_r:shell_prop:s0
diff --git a/system_app.te b/system_app.te
index a8ad762c81223e643d28d24ddd5f1b311a3ffaea..3084e936378c9de14c92798ddf684d5e8cb88cde 100644
--- a/system_app.te
+++ b/system_app.te
@@ -33,3 +33,6 @@ allow system_app sdcard_type:dir r_dir_perms;
 # Allow settings app to read from asec
 allow system_app asec_apk_file:dir search;
 allow system_app asec_apk_file:file r_file_perms;
+
+# Write to properties
+allow system_app system_prop:property_service set;
diff --git a/system_server.te b/system_server.te
index cae5cb0a54cad9f049f1d13198836b661c86bfb4..782c27f97a31c606853a89306238eccabb6ec0a6 100644
--- a/system_server.te
+++ b/system_server.te
@@ -147,6 +147,7 @@ allow system_server anr_data_file:dir relabelto;
 # Property Service write
 allow system_server system_prop:property_service set;
 allow system_server radio_prop:property_service set;
+allow system_server debug_prop:property_service set;
 
 # ctl interface
 allow system_server ctl_default_prop:property_service set;