diff --git a/metadata/org.yaxim.androidclient.txt b/metadata/org.yaxim.androidclient.txt
index e93e513bfa..e66dd74340 100644
--- a/metadata/org.yaxim.androidclient.txt
+++ b/metadata/org.yaxim.androidclient.txt
@@ -23,27 +23,82 @@ certificates need to be accepted.
Repo Type:git
Repo:https://github.com/ge0rg/yaxim.git
-Build Version:0.7.4,5,0.7.4,oldsdkloc=yes
-Build Version:0.7.5,6,0.7.5,oldsdkloc=yes,submodules=yes,fixtrans=yes
-Build Version:0.7.6,7,03a868e,oldsdkloc=yes,submodules=yes,fixtrans=yes,target=android-10
-Build Version:0.7.7,8,0.7.7,oldsdkloc=yes,submodules=yes,fixtrans=yes,target=android-10
-Build Version:0.8.0,9,0.8.0,oldsdkloc=yes,submodules=yes,fixtrans=yes,target=android-10
-Build Version:0.8.1,10,0.8.1,oldsdkloc=yes,submodules=yes,fixtrans=yes,target=android-10
-Build Version:0.8.2,11,0.8.2,oldsdkloc=yes,submodules=yes,fixtrans=yes,target=android-10
-Build Version:0.8.3,12,!can't find corresponding source code
-Build Version:0.8.4,13,0.8.4,oldsdkloc=yes,submodules=yes,fixtrans=yes,target=android-10,prebuild=android update project -p android-actionbar/actionbar,prebuild=sed -i "s/-optimi.*/-dontoptimize/" proguard.cfg
+Build:0.7.4,5
+ commit=0.7.4
+ oldsdkloc=yes
+
+Build:0.7.5,6
+ commit=0.7.5
+ submodules=yes
+ oldsdkloc=yes
+ fixtrans=yes
+
+Build:0.7.6,7
+ commit=03a868e
+ submodules=yes
+ oldsdkloc=yes
+ target=android-10
+ fixtrans=yes
+
+Build:0.7.7,8
+ commit=0.7.7
+ submodules=yes
+ oldsdkloc=yes
+ target=android-10
+ fixtrans=yes
+
+Build:0.8.0,9
+ commit=0.8.0
+ submodules=yes
+ oldsdkloc=yes
+ target=android-10
+ fixtrans=yes
+
+Build:0.8.1,10
+ commit=0.8.1
+ submodules=yes
+ oldsdkloc=yes
+ target=android-10
+ fixtrans=yes
+
+Build:0.8.2,11
+ commit=0.8.2
+ submodules=yes
+ oldsdkloc=yes
+ target=android-10
+ fixtrans=yes
+
+Build:0.8.3,12
+ disable=can't find corresponding source code
+ commit=unknown - see disabled
+
+Build:0.8.4,13
+ commit=0.8.4
+ submodules=yes
+ oldsdkloc=yes
+ target=android-10
+ fixtrans=yes
+ prebuild=sed -i "s/-optimi.*/-dontoptimize/" proguard.cfg
+
#Shouldn't need to update ABS like this normally
-Build Version:0.8.6,15,0.8.6,submodules=yes,target=android-14,prebuild=\
-sed -i 's/android-3/android-7/g' MemorizingTrustManager/project.properties && \
-$$SDK$$/tools/android update project -p ActionBarSherlock/library -s -t android-14 && \
-sed -i '4 i 0.8.6\n' res/values/strings.xml
-Build Version:0.8.6b,16,0.8.6b,submodules=yes,init=rm build.xml && \
-sed -i 's/android-3/android-7/g' MemorizingTrustManager/project.properties && \
-$$SDK$$/tools/android update project -p ActionBarSherlock/library -s -t android-14,\
-prebuild=sed -i '4 i 0.8.6b' res/values/strings.xml
+Build:0.8.6,15
+ commit=0.8.6
+ submodules=yes
+ target=android-14
+ prebuild=sed -i 's/android-3/android-7/g' MemorizingTrustManager/project.properties && \
+ $$SDK$$/tools/android update project -p ActionBarSherlock/library -s -t android-14 && \
+ sed -i '4 i 0.8.6\n' res/values/strings.xml
+
+Build:0.8.6b,16
+ commit=0.8.6b
+ submodules=yes
+ init=rm build.xml && \
+ sed -i 's/android-3/android-7/g' MemorizingTrustManager/project.properties && \
+ $$SDK$$/tools/android update project -p ActionBarSherlock/library -s -t android-14
+ prebuild=sed -i '4 i 0.8.6b' res/values/strings.xml
Auto Update Mode:None
Update Check Mode:Tags
-Current Version:0.8.6b
-Current Version Code:16
+Current Version:@string/build_revision
+Current Version Code:17