diff --git a/metadata/org.hanenoshino.onscripter.txt b/metadata/org.hanenoshino.onscripter.txt
new file mode 100644
index 0000000000..13fd4e020b
--- /dev/null
+++ b/metadata/org.hanenoshino.onscripter.txt
@@ -0,0 +1,62 @@
+Category:Games
+License:GPLv2+
+#
+# Following Android ports can be found on Internet:
+# 1 Older version of Natdon's, already unbuildable; original focus of most non-JP efforts.
+#
+#   Hosted on:
+#   http://sourceforge.net/p/onscripter/code-0/ (earliest upload?)
+#   http://code.google.com/p/onscripter/
+#
+#   Package: cn.natdon.onscripter
+#
+# 2 Newer maintained version of CN fork, recently merged with MiNE3. Relies on closed-source vitamio.jar 
+#   for video playback (see also https://bbs.vitamio.org/topics/83?locale=en).
+#
+#   Hosted on:
+#   https://github.com/natdon/ONScripter-CN/
+#
+#   Package: cn.natdon.onscripterv2
+#
+# 3 Our package; was based on #1, but later backported stuff from various sources
+#
+# 4 http://onscripter.sourceforge.jp/android/android.html - upstream Japanese attempt. Also happens to 
+#   be upstream for engine core. Use tarballs for publishing, but developer of #3 tracks them on Github.
+#
+#   Hosted on:
+#   http://onscripter.sourceforge.jp/onscripter.html#package-source (core tarballs)
+#   https://github.com/shinohane/onscripter-versiontrack
+#   http://onscripter.sourceforge.jp/android/android.html#sdk (android tarballs)
+#   https://github.com/shinohane/onscripter_android-versiontrack
+#
+#   package: jp.ogapee.onscripter
+#
+Web Site:http://onscripter.sourceforge.jp/android/android.html
+# See also http://onscripter.sourceforge.jp/android/android.html#sdk
+# (hardcore Japanese developers don't use VCS!)
+Source Code:http://code.google.com/p/onscripter/
+# All other trackers are empty..
+Issue Tracker:http://onscripter.sourceforge.jp/cgi-bin/kagemai/guest.cgi?project=onscripter&action=top
+
+Name:ONScripter
+Summary:Visual Novel player
+Description:
+Only English ONScripter games are known to be supported. This port uses upstream ONScripter engine, but 
+any Android-specific issues should be reported to port developer (see source code link).
+.
+
+Repo Type:git
+Repo:https://github.com/shinohane/onscripter
+
+Build Version:20120310,20120310,eaf9848c79,buildjni=yes,target=android-17,\
+scanignore=jni/sdl_ttf/VisualC,srclibs=ONScripter@28b4b185ba,\
+init=echo "APP_CFLAGS += -DENABLE_1BYTE_CHAR -DFORCE_1BYTE_CHAR" > jni/Application.mk,\
+prebuild=cp -r $$ONScripter$$ jni/application/onscripter-20120310,\
+patch=jpeg.patch
+
+Auto Update Mode:None
+# Not that it has good chances to be updated anyway..
+# (see https://github.com/shinohane/ONScripter-SAO for blob-filled replacement..)
+Update Check Mode:None
+Current Version:20120310
+Current Version Code:20120310
diff --git a/metadata/org.hanenoshino.onscripter/jpeg.patch b/metadata/org.hanenoshino.onscripter/jpeg.patch
new file mode 100644
index 0000000000..1b1907b6c8
--- /dev/null
+++ b/metadata/org.hanenoshino.onscripter/jpeg.patch
@@ -0,0 +1,31 @@
+diff --git a/p/jni/jpeg/jidctfst.S b/p/jni/jpeg/jidctfst.S
+index 34e1c24..b35f938 100644
+--- a/jni/jpeg/jidctfst.S
++++ b/jni/jpeg/jidctfst.S
+@@ -63,7 +63,7 @@
+ 
+ 
+ jpeg_idct_ifast:
+-    PLD     (r2, #0)
++    PLD     [r2, #0]
+     stmdb   sp!, {r4,r5, r6,r7, r8,r9, r10,r11, r12,lr}
+     ldr     r4, [sp, #4*10]
+     sub     sp, #local_SIZE
+@@ -256,7 +256,7 @@ VLoopHead:
+ 
+ HLoopStart:
+     // reset pointers
+-    PLD     (sp, #off_WORKSPACE)
++    PLD     [sp, #off_WORKSPACE]
+     add     ip, sp, #off_WORKSPACE
+     ldr     r10, local_RANGE_TABLE
+ 
+@@ -268,7 +268,7 @@ HLoopTail:
+     str      r0, local_OUTPUT_BUF
+     add      fp, r2, r1
+ 
+-    PLD      (ip, #32)
++    PLD      [ip, #32]
+     ldmia    ip!, {r0-r7}
+ 
+     cmp      r1, #0
diff --git a/srclibs/ONScripter.txt b/srclibs/ONScripter.txt
new file mode 100644
index 0000000000..f831f43e5a
--- /dev/null
+++ b/srclibs/ONScripter.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/shinohane/onscripter-versiontrack