diff --git a/Android.mk b/Android.mk
index 062ebf5489..e60613f9a2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,8 +38,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := Launcher2
 LOCAL_CERTIFICATE := platform
-#LOCAL_CERTIFICATE := shared
+LOCAL_CERTIFICATE := shared
 
-#LOCAL_OVERRIDES_PACKAGES := Home
+LOCAL_OVERRIDES_PACKAGES := Launcher
 
 include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6b49b64893..e6d8435bb8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,8 +83,9 @@
             android:windowSoftInputMode="stateUnspecified|adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.MONKEY"/>
             </intent-filter>
         </activity>