diff --git a/metadata/com.artifex.mupdfdemo.txt b/metadata/com.artifex.mupdfdemo.txt
index c70ef8c757..dec6f64fbb 100644
--- a/metadata/com.artifex.mupdfdemo.txt
+++ b/metadata/com.artifex.mupdfdemo.txt
@@ -5,18 +5,17 @@ Source Code:http://git.ghostscript.com/?p=mupdf.git;a=summary
Issue Tracker:http://bugs.ghostscript.com/
Auto Name:MuPDF
-Summary:Document viewer
+Summary:Lightweight document viewer
Description:
-A lightweight, high quality PDF/XPS/CBZ viewer.
+'''N.B''' The names of the versions correspond to the chip architectures that
+the apk is designed to run on.
+This is the only PDF viewer we have that is designed for MIPS; we don't have
+an ARMv7a apk for the moment due to limitations in our repo index, but ARM is
+plenty fast.
-The renderer in MuPDF is tailored for high quality anti-aliased graphics. It
-renders text with metrics and spacing accurate to within fractions of a pixel
-for the highest fidelity in reproducing the look of a printed page on screen.
-
-MuPDF is also small, fast, and yet complete. It supports PDF 1.7 with
-transparency, encryption, hyperlinks, annotations, searching and more. It also
-reads OpenXPS documents. MuPDF is written modularly, so features can be added
-on by integrators if they so desire.
+MuPDF supports PDF 1.7 with transparency, encryption, hyperlinks, annotations,
+searching and more.
+It also reads OpenXPS and CBZ (comic book) documents.
.
Repo Type:git
@@ -25,8 +24,22 @@ Repo:http://git.ghostscript.com/mupdf.git
Build Version:1.2,2,1.2,subdir=android,submodules=yes,buildjni=yes,prebuild=\
cd .. && make generate && cd android
+Build Version:1.2-ARM,49,0516026e,forceversion=yes,forcevercode=yes,\
+subdir=platform/android,submodules=yes,patch=arm.patch,prebuild=\
+cd ../.. && make generate,buildjni=yes
+Build Version:1.2-ARMv7a,50,!no room in index for armv7 at 0516026e,\
+subdir=platform/android,submodules=yes,prebuild=\
+cd ../.. && make generate,buildjni=yes
+Build Version:1.2-x86,51,0516026e,forceversion=yes,forcevercode=yes,\
+subdir=platform/android,submodules=yes,patch=x86.patch,prebuild=\
+cd ../.. && make generate,buildjni=yes
+Build Version:1.2-MIPS,52,0516026e,forceversion=yes,forcevercode=yes,\
+subdir=platform/android,submodules=yes,patch=mips.patch,prebuild=\
+cd ../.. && make generate,buildjni=yes
+
Auto Update Mode:None
-# Tags would wipe out submodules; Market version code is way ahead
+# Tags would wipe out submodules
+# Don't build ARMv7a until we can support more than 3 apks
Update Check Mode:RepoManifest
Current Version:1.2 (Build 50/armv7a)
Current Version Code:50
diff --git a/metadata/com.artifex.mupdfdemo/arm.patch b/metadata/com.artifex.mupdfdemo/arm.patch
new file mode 100644
index 0000000000..b43eb2491a
--- /dev/null
+++ b/metadata/com.artifex.mupdfdemo/arm.patch
@@ -0,0 +1,22 @@
+diff --git a/platform/android/jni/Application.mk b/platform/android/jni/Application.mk
+index 60909b6..a15f9f2 100644
+--- a/platform/android/jni/Application.mk
++++ b/platform/android/jni/Application.mk
+@@ -3,13 +3,13 @@
+ # Suppose our base version is X:
+
+ # Version X: armeabi
+-#APP_PLATFORM=android-8
+-#APP_ABI := armeabi
++APP_PLATFORM=android-8
++APP_ABI := armeabi
+
+ # Version X+1: armeabi-v7a (Much faster due to the availability of hardware
+ # FP, but cannot be run in the emulator).
+-APP_PLATFORM=android-8
+-APP_ABI := armeabi-v7a
++#APP_PLATFORM=android-8
++#APP_ABI := armeabi-v7a
+
+ # Version X+2: x86 (Requires android-9, so a change needs to be made in
+ # AndroidManifest.xml too)
diff --git a/metadata/com.artifex.mupdfdemo/mips.patch b/metadata/com.artifex.mupdfdemo/mips.patch
new file mode 100644
index 0000000000..2cdb1dd73e
--- /dev/null
+++ b/metadata/com.artifex.mupdfdemo/mips.patch
@@ -0,0 +1,39 @@
+diff --git a/platform/android/AndroidManifest.xml b/platform/android/AndroidManifest.xml
+index 040663e..e20c328 100644
+--- a/platform/android/AndroidManifest.xml
++++ b/platform/android/AndroidManifest.xml
+@@ -11,7 +11,7 @@
+ android:normalScreens="true"
+ android:largeScreens="true"
+ android:anyDensity="true" />
+-
++
+
+-
++
+