diff --git a/init/property_service.c b/init/property_service.c
index 6bf06b4f7..f6e40533f 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -92,6 +92,7 @@ struct {
     { "persist.service.", AID_SYSTEM,   0 },
     { "persist.security.", AID_SYSTEM,   0 },
     { "persist.service.bdroid.", AID_BLUETOOTH,   0 },
+    { "persist.selinux.enforcing", AID_SYSTEM,  0},
     { "selinux."         , AID_SYSTEM,   0 },
     { NULL, 0, 0 }
 };
diff --git a/rootdir/init.rc b/rootdir/init.rc
index b7f9febfc..fb58a3114 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -416,6 +416,12 @@ on property:selinux.reload_policy=1
     restart ueventd
     restart installd
 
+on property:persist.selinux.enforcing=1
+    setenforce 1
+
+on property:persist.selinux.enforcing=0
+    setenforce 0
+
 service console /system/bin/sh
     class core
     console