diff --git a/metadata/org.openmsx.android.openmsx.txt b/metadata/org.openmsx.android.openmsx.txt
index c3ecc9d218..0a67e6a045 100644
--- a/metadata/org.openmsx.android.openmsx.txt
+++ b/metadata/org.openmsx.android.openmsx.txt
@@ -24,15 +24,20 @@ descriptors and firmware for nonexisting configurations, such as so called
 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
+# Note: OpenMSX version code and name are generated from it's VCS history by launch_anddev_build.sh
+Repo Type:srclib
+Repo:libsdl-android
 
-Build Version:0.9.1-584,11527,!patch doesn't apply 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 && declare -rx VERSION_NAME=0.9.1-584 && ./launch_anddev_build.sh
+# setup_anddev.sh downloads TCL sources and builds them in one go
+Build Version:0.9.1-584,11527,openttd-1.2.3.25,update=no,srclibs=OpenMSX@728325a472,buildjni=no,\
+subdir=project,patch=tcl.patch,scanignore=build/srclib/libsdl-android/project/jni/tcl8.5/lib,\
+init=ln -s ../../OpenMSX openmsx && find . -name "*.so" -delete &&\
+ sed -ri 's/ant debug|ant release/exit/' ../build.sh &&\
+ export SDL_ANDROID_PORT_PATH=`readlink -f ..` && cd openmsx/build/android && ./setup_anddev.sh,\
+prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml,\
+build=cd $$OpenMSX$$/build/android/openmsx &&\
+ declare -rx VERSION_NAME=0.9.1-584 &&\
+ ./launch_anddev_build.sh
 
 Auto Update Mode:None
 # Tags and AndroidManifest are unusable. See http://openmsx.fixato.net/builds/android/
diff --git a/metadata/org.openmsx.android.openmsx/tcl.patch b/metadata/org.openmsx.android.openmsx/tcl.patch
new file mode 100644
index 0000000000..baf262a039
--- /dev/null
+++ b/metadata/org.openmsx.android.openmsx/tcl.patch
@@ -0,0 +1,17 @@
+--- a/project/openmsx/build/packages.py
++++ b/project/openmsx/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/metadata/org.openmsx.android.openmsx/tcl_quickfix.patch b/metadata/org.openmsx.android.openmsx/tcl_quickfix.patch
deleted file mode 100644
index e340a2d0a7..0000000000
--- a/metadata/org.openmsx.android.openmsx/tcl_quickfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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/OpenMSX.txt b/srclibs/OpenMSX.txt
new file mode 100644
index 0000000000..ab54dcf4cd
--- /dev/null
+++ b/srclibs/OpenMSX.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:git://git.code.sf.net/p/openmsx/openmsx
diff --git a/srclibs/libsdl-android.txt b/srclibs/libsdl-android.txt
index 389367bc37..2f3d7cec4a 100644
--- a/srclibs/libsdl-android.txt
+++ b/srclibs/libsdl-android.txt
@@ -1,3 +1,2 @@
 Repo Type:git
 Repo:https://github.com/pelya/commandergenius.git
-