diff --git a/sepolicy/adbd.te b/sepolicy/adbd.te
new file mode 100644
index 0000000..80627d6
--- /dev/null
+++ b/sepolicy/adbd.te
@@ -0,0 +1 @@
+set_prop(adbd, adbsecure_prop)
diff --git a/sepolicy/property.te b/sepolicy/property.te
index 1e6b220..ca257a3 100644
--- a/sepolicy/property.te
+++ b/sepolicy/property.te
@@ -1,3 +1,4 @@
 type adbtcp_prop, property_type;
 type recovery_prop, property_type;
 type userinit_prop, property_type;
+type adbsecure_prop, property_type;
diff --git a/sepolicy/property_contexts b/sepolicy/property_contexts
index ce5c71a..98c863e 100644
--- a/sepolicy/property_contexts
+++ b/sepolicy/property_contexts
@@ -1,4 +1,4 @@
 adb.network.port              u:object_r:adbtcp_prop:s0
 recovery.perf.mode            u:object_r:recovery_prop:s0
-adb.secure                    u:object_r:recovery_prop:s0
+ro.adb.secure                 u:object_r:adbsecure_prop:s0
 cm.userinit.active            u:object_r:userinit_prop:s0
diff --git a/sepolicy/sysinit.te b/sepolicy/sysinit.te
index 6fd0b85..1a451a3 100644
--- a/sepolicy/sysinit.te
+++ b/sepolicy/sysinit.te
@@ -7,6 +7,8 @@
 allow sysinit devpts:chr_file { rw_file_perms };
 allow sysinit shell_exec:file { rx_file_perms };
 allow sysinit system_file:file { rx_file_perms };
+allow sysinit system_file:dir { r_dir_perms };
+allow sysinit toolbox_exec:file { rx_file_perms };
 allow sysinit self:process setcurrent;
 
 userdebug_or_eng(`