diff --git a/tools/android/packaging/Makefile b/tools/android/packaging/Makefile
index 40536b3d70..e6be9de6d7 100644
--- a/tools/android/packaging/Makefile
+++ b/tools/android/packaging/Makefile
@@ -83,6 +83,12 @@ apk-obb-unsigned: apk-clean sharedobb package
 
 apk-noobb: apk-clean package apk-sign
 
+launcher:
+	cp -fp xbmc/AndroidManifest.xml.launcher xbmc/AndroidManifest.xml
+
+nolauncher:
+	git checkout xbmc/AndroidManifest.xml
+
 xbmc/assets:
 	mkdir -p xbmc/assets
 
diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml
index f59bd8d837..30b9bbde91 100644
--- a/tools/android/packaging/xbmc/AndroidManifest.xml
+++ b/tools/android/packaging/xbmc/AndroidManifest.xml
@@ -29,9 +29,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="tv.ouya.intent.category.APP"/>
-                <category android:name="android.intent.category.HOME" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.MONKEY" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
             <intent-filter>
diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml.launcher b/tools/android/packaging/xbmc/AndroidManifest.xml.launcher
new file mode 100644
index 0000000000..f59bd8d837
--- /dev/null
+++ b/tools/android/packaging/xbmc/AndroidManifest.xml.launcher
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BEGIN_INCLUDE(manifest) -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.semperpax.spmc"
+    android:installLocation="auto"
+    android:versionCode="13030300"
+    android:versionName="13.3.3 (SPMC)" >
+
+    <!-- This is the platform API where NativeActivity was introduced. -->
+    <uses-sdk android:minSdkVersion="14" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+	
+    <application android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:hasCode="true">
+        <activity
+            android:name=".Splash"
+            android:configChanges="orientation|keyboard|keyboardHidden|navigation|touchscreen"
+            android:finishOnTaskLaunch="true"
+            android:launchMode="singleInstance"
+            android:screenOrientation="sensorLandscape"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="tv.ouya.intent.category.APP"/>
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.MONKEY" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:mimeType="video/*" />
+                <data android:mimeType="audio/*" />
+                <data android:mimeType="image/*" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:scheme="ftp" />
+                <data android:scheme="ftps" />
+                <data android:scheme="rtp" />
+                <data android:scheme="rtsp" />
+                <data android:scheme="mms" />
+                <data android:scheme="dav" />
+                <data android:scheme="davs" />
+                <data android:scheme="ssh" />
+                <data android:scheme="sftp" />
+                <data android:scheme="smb" />
+             </intent-filter>
+        </activity>
+
+        <!--
+             Our activity is the built-in NativeActivity framework class.
+             This will take care of integrating with our NDK code.
+        -->
+        <activity
+            android:name=".Main"
+            android:configChanges="orientation|keyboard|keyboardHidden|navigation|touchscreen"
+            android:finishOnTaskLaunch="true"
+            android:label="XBMC"
+            android:launchMode="singleInstance"
+            android:screenOrientation="sensorLandscape"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+
+            <!-- Tell NativeActivity the name of or .so -->
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="xbmc" />
+        </activity>
+    </application>
+
+</manifest><!-- END_INCLUDE(manifest) -->
+