diff --git a/Android.mk b/Android.mk
index eb240cdb029e102c80ec25b9d4a9ced66f640a4f..87cfe610773ce90b9c6b261dbf85248a4b3a719d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -179,7 +179,7 @@ ALL_MAC_PERMS_FILES := $(call build_policy, $(LOCAL_MODULE))
 
 $(LOCAL_BUILT_MODULE) : $(mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insertkeys.py $(ALL_MAC_PERMS_FILES)
 	@mkdir -p $(dir $@)
-	$(hide) $(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -d $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE)) -c $(TOP) $< -o $@ $(ALL_MAC_PERMS_FILES)
+	$(hide) $(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(TOP) $< -o $@ $(ALL_MAC_PERMS_FILES)
 
 mac_perms_keys.tmp :=
 ##################################
diff --git a/keys.conf b/keys.conf
index cca95e960b0ee77ba67bcc93d17907a865966332..c002897909052cd4c2ea5fd1a85b50ee7894a1fc 100644
--- a/keys.conf
+++ b/keys.conf
@@ -9,17 +9,17 @@
 #
 
 [@PLATFORM]
-ALL : platform.x509.pem
+ALL : build/target/product/security/platform.x509.pem
 
 [@MEDIA]
-ALL : media.x509.pem
+ALL : build/target/product/security/media.x509.pem
 
 [@SHARED]
-ALL : shared.x509.pem
+ALL : build/target/product/security/shared.x509.pem
 
 # Example of ALL TARGET_BUILD_VARIANTS
 [@RELEASE]
-ENG       : testkey.x509.pem
-USER      : testkey.x509.pem
-USERDEBUG : testkey.x509.pem
+ENG       : build/target/product/security/testkey.x509.pem
+USER      : build/target/product/security/testkey.x509.pem
+USERDEBUG : build/target/product/security/testkey.x509.pem