diff --git a/CleanSpec.mk b/CleanSpec.mk
index f5f79919e..f34134ad2 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -334,6 +334,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
 
+# Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/core/main.mk b/core/main.mk
index 0e058af77..61b2e5a2d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -393,7 +393,7 @@ ifndef is_sdk_build
   # Don't compile apps on eng builds to speed startup
   ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=interpret-only
 endif
-  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.usejit=true
+  ADDITIONAL_BUILD_PROPERTIES += debug.dalvik.vm.usejit=true
 endif
 
 ## sdk ##