diff --git a/property.te b/property.te
index d0c77a4..55888d1 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 6c47c9f..75c927f 100644
--- a/property_contexts
+++ b/property_contexts
@@ -26,7 +26,7 @@
 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 a8ad762..3084e93 100644
--- a/system_app.te
+++ b/system_app.te
@@ -33,3 +33,6 @@
 # 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 cae5cb0..782c27f 100644
--- a/system_server.te
+++ b/system_server.te
@@ -147,6 +147,7 @@
 # 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;