diff --git a/metadata/org.openmsx.android.openmsx.txt b/metadata/org.openmsx.android.openmsx.txt
new file mode 100644
index 0000000000..4e2d8b8daa
--- /dev/null
+++ b/metadata/org.openmsx.android.openmsx.txt
@@ -0,0 +1,41 @@
+Category:Games
+License:GPLv2
+Web Site:http://www.openmsx.org
+Source Code:http://sourceforge.net/p/openmsx/openmsx/
+Issue Tracker:http://sourceforge.net/p/openmsx/bugs/
+
+Summary:MSX emulator
+Description:
+MSX is a non IBM PC compatible computer architecture, which was popular mostly in Japan, the 
+Middle East, the Soviet Union, and to a lesser extent, several other European countries. Many 
+popular titles, including [https://en.wikipedia.org/wiki/Wizardry Wizardry], 
+[https://en.wikipedia.org/wiki/Snatcher Snatcher], and initially, 
+[https://en.wikipedia.org/wiki/Metal_Gear_%28series%29 the Metal Gear series] targeted 
+MSX as their primary platform.
+
+OpenMSX emulates wide range of MSX hardware. Built-in FOSS firmware supports *.rom images and 
+allows using directories as drives. In order to run games for floppy drives (*.dsk images), as 
+well as software, using exotic devices, you may have to acquire firmware files for those 
+(misleadingly called "ROMs") and put them into 
+/sdcard/Android/data/org.openmsx.android.openmsx/files/openmsx_system. Firmware files can be 
+dumped from real machines or downloaded from the net. It is possible to create and use hardware 
+descriptors and firmware for nonexisting configurations, such as so called 
+[https://encrypted.google.com/search?q=Modified_MSX2_EN Modified_MSX2_EN], which contains handful 
+of drivers and have good (virtual) hardware capabilities.
+.
+
+# Note: version code and name are generated from git history in launch_anddev_build.sh
+Repo Type:git
+Repo:git://git.code.sf.net/p/openmsx/openmsx
+
+Build Version:openmsx-0.9.1-584-g728325a,11527,728325a472,target=android-15,update=no,\
+srclibs=libsdl-android@3c7a9b79ec,subdir=build/android,patch=tcl_quickfix.patch\
+prebuild=./setup_anddev.sh `realpath $$libsdl-android$$`,\
+build=cd openmsx && ./launch_anddev_build.sh
+
+Auto Update Mode:None
+# Tags and AndroidManifest are unusable. See http://openmsx.fixato.net/builds/android/
+Update Check Mode:None
+Current Version:openmsx-0.9.1-565-g214cf93
+Current Version Code:11508
+
diff --git a/metadata/org.openmsx.android.openmsx/tcl_quickfix.patch b/metadata/org.openmsx.android.openmsx/tcl_quickfix.patch
new file mode 100644
index 0000000000..e340a2d0a7
--- /dev/null
+++ b/metadata/org.openmsx.android.openmsx/tcl_quickfix.patch
@@ -0,0 +1,19 @@
+diff --git a/build/packages.py b/build/packages.py
+index 13317fe..7194941 100644
+--- a/build/packages.py
++++ b/build/packages.py
+@@ -202,11 +202,11 @@ class TCL(DownloadablePackage):
+        downloadURL = 'http://downloads.sourceforge.net/tcl'
+        niceName = 'Tcl'
+        sourceName = 'tcl'
+-       version = '8.5.14'
+-       fileLength = 4528533
++       version = '8.5.11'
++       fileLength = 4484001
+        checksums = {
+                'sha256':
+-                       '7494e94f1e195a505c542a3c50e01589d2f8bfd19597382827a895fa1c471f2d',
++                       '8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a',
+                }
+ 
+        @classmethod
diff --git a/srclibs/libsdl-android.txt b/srclibs/libsdl-android.txt
new file mode 100644
index 0000000000..389367bc37
--- /dev/null
+++ b/srclibs/libsdl-android.txt
@@ -0,0 +1,3 @@
+Repo Type:git
+Repo:https://github.com/pelya/commandergenius.git
+