diff --git a/products/common.mk b/products/common.mk
index 64a02685..b4d0f304 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -37,7 +37,6 @@ PRODUCT_PACKAGES += \
     CMParts \
     CMStats \
     CMUpdateNotify \
-    CMWallpapers \
     DSPManager \
     libcyanogen-dsp \
     Pacman
diff --git a/products/common_full.mk b/products/common_full.mk
index a71c35f8..d5fc4a24 100644
--- a/products/common_full.mk
+++ b/products/common_full.mk
@@ -1,6 +1,10 @@
 # Inherit common CM stuff
 $(call inherit-product, vendor/cyanogen/products/common.mk)
 
+# CyanogenMod specific product packages
+PRODUCT_PACKAGES += \
+    CMWallpapers
+
 # Bring in all audio files
 include frameworks/base/data/sounds/AllAudio.mk
 
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index bfe1cd19..3aff0c14 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -25,6 +25,9 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRJ22 BUILD_FING
 # Extra DS overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dream_sapphire
 
+# Add the CMWallpapers app
+PRODUCT_PACKAGES += CMWallpapers
+
 # This file is used to install the correct audio profile when booted
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/dream_sapphire/etc/init.d/02audio_profile:system/etc/init.d/02audio_profile
diff --git a/products/cyanogen_one.mk b/products/cyanogen_one.mk
index b8e50c1a..6ac373b2 100644
--- a/products/cyanogen_one.mk
+++ b/products/cyanogen_one.mk
@@ -17,6 +17,9 @@ PRODUCT_MODEL := Geeksphone ONE
 PRODUCT_MANUFACTURER := Geeksphone
 PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=geeksphone-one PRODUCT_NAME=geeksphone_one BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
 
+# Add the CMWallpapers app
+PRODUCT_PACKAGES += CMWallpapers
+
 #
 # Move dalvik cache to data partition where there is more room to solve startup problems
 #