diff --git a/core/Makefile b/core/Makefile
index 4f4824b0ec2..42ecd9b6ea1 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -672,7 +672,7 @@ else
 ifeq ($(BOARD_USES_RECOVERY_CHARGEMODE),true)
   $(error BOARD_USES_RECOVERY_CHARGEMODE is deprecated. Please see http://bit.ly/opcSJZ on how to properly implement chargemode in recovery. Or just remove the BOARD_USES_RECOVERY_CHARGEMODE if you are lazy. I will hate you though. -Koush)
 else
-  recovery_initrc := $(call include-path-for, recovery)/etc/init.rc
+  recovery_initrc := $(call project-path-for,recovery)/etc/init.rc
 endif
 endif
 ifneq ($(TARGET_PREBUILT_RECOVERY_KERNEL),)
@@ -684,7 +684,7 @@ recovery_uncompressed_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.cpio
 recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img
 recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET)
 recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery
-recovery_resources_common := $(call include-path-for, recovery)/res
+recovery_resources_common := $(call project-path-for,recovery)/res
 recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res))
 recovery_root_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/root))
 recovery_resource_deps := $(shell find $(recovery_resources_common) \
diff --git a/core/config.mk b/core/config.mk
index 9636ab839de..c6e9238c6a9 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -163,10 +163,9 @@ endif
 TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))
 board_config_mk :=
 
-## Rebuild the pathmap if there's a recovery variant. Its path probably changed
-ifneq ($(RECOVERY_VARIANT),)
-include $(BUILD_SYSTEM)/pathmap.mk
-endif
+# General entries for project pathmap.  Any entries listed here should
+# be device and hardware intedpendent.
+$(call set_project_variant_path,recovery,RECOVERY_VARIANT,bootable/recovery)
 
 # Perhaps we should move this block to build/core/Makefile,
 # once we don't have TARGET_NO_KERNEL reference in AndroidBoard.mk/Android.mk.
diff --git a/core/pathmap.mk b/core/pathmap.mk
index c69b6d70e69..8f0f252a02e 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -53,12 +53,6 @@ pathmap_INCL := \
     wilhelm-ut:frameworks/wilhelm/src/ut \
     speex:external/speex/include
 
-ifneq ($(RECOVERY_VARIANT),)
-    pathmap_INCL += recovery:bootable/recovery-$(RECOVERY_VARIANT)
-else
-    pathmap_INCL += recovery:bootable/recovery
-endif
-
 #
 # Returns the path to the requested module's include directory,
 # relative to the root of the source tree.  Does not handle external