diff --git a/Android.mk b/Android.mk
index 8c3c47f..15630f4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,4 +2,8 @@
 # This is a hacky way to do that.
 ifdef CYANOGEN_WITH_GOOGLE
     PACKAGES.Email.OVERRIDES := Provision LatinIME QuickSearchBox
+endif
+
+ifndef DEFAULT_LAUNCHER
+    PACKAGES.ADWLauncher.OVERRIDES := Launcher Launcher2
 endif
\ No newline at end of file
diff --git a/products/common.mk b/products/common.mk
index 32dd21a..49e9291 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -23,6 +23,10 @@
 # Enable Windows Media if supported by the board
 WITH_WINDOWS_MEDIA:=true
 
+ifndef DEFAULT_LAUNCHER
+    PRODUCT_PACKAGES += ADWLauncher
+endif
+
 # CyanogenMod specific product packages
 PRODUCT_PACKAGES += \
     CMParts \
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index dbb9174..e3ef4b0 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -1,6 +1,8 @@
 # Inherit AOSP device configuration for passion.
 $(call inherit-product, device/motorola/sholes/sholes.mk)
 
+DEFAULT_LAUNCHER := true
+
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common.mk)