diff --git a/metadata/paulscode.android.mupen64plus.txt b/metadata/paulscode.android.mupen64plus.txt
index 78d58b27df..9a9dd5b701 100644
--- a/metadata/paulscode.android.mupen64plus.txt
+++ b/metadata/paulscode.android.mupen64plus.txt
@@ -1,3 +1,4 @@
+Disabled:use paulscode.android.mupen64plusae
 Category:Games
 License:GPLv2
 Web Site:http://www.paulscode.com/forum/index.php?topic=96
@@ -7,25 +8,10 @@ Issue Tracker:https://github.com/paulscode/mupen64plus-ae/issues
 Summary:Nintendo 64 Emulator
 Description:
 Mupen64Plus, Android Edition (AE) is a port of Mupen64Plus to Android. 
-(Not officially supported by the Mupen64Plus team). 
-See [http://www.pdroms.de this website] for public domain ROMs.
-See the 
-[http://mupen64plus.wikia.com/wiki/Mupen64Plus,_Android_Edition_%28AE%29_Wiki compatibility wiki]
-for info about specific games.
-
-Getting started:
-* Transfer ROMs anywhere to your internal storage (default /sdcard/roms/n64/)
-* Browse to them from within the app
-* Default SD card directory on most devices is /mnt/sdcard
-* ROMs must be in .n64, .v64, or .z64 format, optionally in .zip files
 .
 
 Repo Type:git
 Repo:https://github.com/paulscode/mupen64plus-ae.git
 
-Build Version:2.0.0,16,!waiting on source for OUYA jars 2.0.0,buildjni=yes
-
-Update Check Mode:Tags
-Current Version:2.0.0
-Current Version Code:16
+Update Check Mode:None
 
diff --git a/metadata/paulscode.android.mupen64plusae.txt b/metadata/paulscode.android.mupen64plusae.txt
index 478beb3165..3b663a7912 100644
--- a/metadata/paulscode.android.mupen64plusae.txt
+++ b/metadata/paulscode.android.mupen64plusae.txt
@@ -4,29 +4,37 @@ Web Site:http://www.paulscode.com/forum/index.php?topic=96
 Source Code:https://github.com/paulscode/mupen64plus-ae
 Issue Tracker:https://github.com/paulscode/mupen64plus-ae/issues
 
-Summary:Nintendo 64 Emulator
+Summary:Nintendo 64 emulator
 Description:
-Mupen64Plus, Android Edition (AE) is a port of Mupen64Plus to Android. 
-(Not officially supported by the Mupen64Plus team). 
+Mupen64Plus AE (Android Edition) is a port of Mupen64Plus to Android. 
+(Not officially supported by the 
+[http://code.google.com/p/mupen64plus Mupen64Plus] team). 
 See [http://www.pdroms.de this website] for public domain ROMs.
-See the 
-[http://mupen64plus.wikia.com/wiki/Mupen64Plus,_Android_Edition_%28AE%29_Wiki compatibility wiki]
-for info about specific games.
+For info about specific games:
+[http://mupen64plus.wikia.com/wiki/Mupen64Plus,_Android_Edition_%28AE%29_Wiki compatibility wiki].
 
 Getting started:
 * Transfer ROMs anywhere to your internal storage (default /sdcard/roms/n64/)
 * Browse to them from within the app
-* Default SD card directory on most devices is /mnt/sdcard
 * ROMs must be in .n64, .v64, or .z64 format, optionally in .zip files
+
+Ouya SDK library was removed before building: while it is proclaimed
+to be licensed under the Apache license, there isn't any source code for it
+and we don't consider it to be a system library.
+Therefore, any associated functionality won't work.
+
+[https://github.com/paulscode/mupen64plus-ae/raw/master/assets/changelog.txt Changelog]
 .
 
 Repo Type:git
 Repo:https://github.com/paulscode/mupen64plus-ae.git
 
-#remove the other package when this gets built
-Build Version:2.0.0,16,!wait for ouya source 2.0.0,buildjni=yes
+Build Version:2.0.0,16,2.0.0,rm=libs/ouya-sdk.jar,buildjni=yes
+Build Version:2.1.1,21,2.1.1,rm=libs/ouya-sdk.jar,buildjni=yes
 
-Update Check Mode:Tags
-Current Version:2.0.0
-Current Version Code:16
+Auto Update Mode:None
+#In market as paulscode.android.mupen64plus; Tags can't find AM.xml
+Update Check Mode:RepoManifest
+Current Version:2.1.1 (debug)
+Current Version Code:21