diff --git a/metadata/com.android.keepass.txt b/metadata/com.android.keepass.txt
index 2032446b35..7c6046b7b5 100644
--- a/metadata/com.android.keepass.txt
+++ b/metadata/com.android.keepass.txt
@@ -5,7 +5,7 @@ Source Code:https://github.com/bpellin/keepassdroid
 Issue Tracker:https://code.google.com/p/keepassdroid/issues
 Donate:http://www.keepassdroid.com
 
-Auto Name:KeePassDroid
+Auto Name:Dummy
 Summary:KeePass-compatible password safe
 Description:
 A password safe, compatible with KeePass. Keepass is available on all the
@@ -22,35 +22,125 @@ Repo:https://github.com/bpellin/keepassdroid.git
 
 #Build Version:1.8.5,65,2c401b23c11693cd192b
 #Build Version:1.8.4,64,8700924ffad7bddd5b65
-Build Version:1.9,76,v1.9
-Build Version:1.9.1,77,v1.9.1-2
-Build Version:1.9.2,78,v1.9.2
-Build Version:1.9.3.1,80,v1.9.3.1
-Build Version:1.9.5,82,v1.9.5
-Build Version:1.9.6,83,v1.9.6
-Build Version:1.9.7,84,v1.9.7,target=android-8
-Build Version:1.9.8,85,v1.9.8,target=android-8
-Build Version:1.9.9,86,!ndk build fails - needs aes.h (at v1.9.9),target=android-8,buildjni=yes,prebuild=sed -i 's/mips-r2//' jni/Application.mk && sed -i 's/mips-r2-sf//' jni/Application.mk
-Build Version:1.9.14,91,!ndk build fails - needs sha2.h (at v1.9.14),target=android-8,buildjni=yes
-Build Version:1.9.17,94,!ndk build fails - needs sha2.h - might need MIPS ndk (at v1.9.17),target=android-8,buildjni=yes
+Build:1.9,76
+    commit=v1.9
+
+Build:1.9.1,77
+    commit=v1.9.1-2
+
+Build:1.9.2,78
+    commit=v1.9.2
+
+Build:1.9.3.1,80
+    commit=v1.9.3.1
+
+Build:1.9.5,82
+    commit=v1.9.5
+
+Build:1.9.6,83
+    commit=v1.9.6
+
+Build:1.9.7,84
+    commit=v1.9.7
+    target=android-8
+
+Build:1.9.8,85
+    commit=v1.9.8
+    target=android-8
+
+Build:1.9.9,86
+    disable=ndk build fails - needs aes.h (at v1.9.9)
+    commit=v1.9.9
+    target=android-8
+    prebuild=sed -i 's/mips-r2//' jni/Application.mk && \
+        sed -i 's/mips-r2-sf//' jni/Application.mk
+    buildjni=yes
+
+Build:1.9.14,91
+    disable=ndk build fails - needs sha2.h (at v1.9.14)
+    commit=v1.9.14
+    target=android-8
+    buildjni=yes
+
+Build:1.9.17,94
+    disable=ndk build fails - needs sha2.h - might need MIPS ndk (at v1.9.17)
+    commit=v1.9.17
+    target=android-8
+    buildjni=yes
+
 #see jni/prep_build.sh for crypto source urls
-Build Version:1.9.18.3,98,v1.9.18.3,buildjni=yes,prebuild=cd jni && \
-wget http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/sha2-07-01-07.zip && \
-unzip sha2-07-01-07.zip -d sha && cd ..
-Build Version:1.98.1,111,v1.98.1,buildjni=yes,prebuild=cd jni && wget http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/sha2-07-01-07.zip && unzip sha2-07-01-07.zip -d sha && cd ..
-Build Version:1.99.2,116,v1.99.2,prebuild=cd jni && wget http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/sha2-07-01-07.zip && unzip sha2-07-01-07.zip -d sha,buildjni=yes
-Build Version:1.99.4,120,v1.99.4,buildjni=yes,prebuild=cd jni && wget http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/sha2-07-01-07.zip && unzip sha2-07-01-07.zip -d sha
-Build Version:1.99.5,121,v1.99.5,target=android-12,buildjni=yes,prebuild=\
-cd jni && wget http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/sha2-07-01-07.zip && unzip sha2-07-01-07.zip -d sha
-Build Version:1.99.6,122,v1.99.6,extlibs=keepass/sha2-07-01-07.zip,prebuild=\
-unzip libs/sha2-07-01-07.zip -d jni/sha && rm libs/sha2-07-01-07.zip,buildjni=yes
-Build Version:1.99.7.2,125,v1.99.7.2,extlibs=keepass/sha2-07-01-07.zip,prebuild=\
-unzip libs/sha2-07-01-07.zip -d jni/sha && rm libs/sha2-07-01-07.zip,buildjni=yes
-Build Version:1.99.8,126,v1.99.8,extlibs=keepass/sha2-07-01-07.zip,prebuild=\
-unzip libs/sha2-07-01-07.zip -d jni/sha && rm libs/sha2-07-01-07.zip,buildjni=yes
-Build Version:1.99.9,127,v1.99.9,extlibs=keepass/sha2-07-01-07.zip,prebuild=\
-unzip libs/sha2-07-01-07.zip -d jni/sha && rm libs/sha2-07-01-07.zip,buildjni=yes
-Build Version:1.99.10,128,1.99.10,target=android-12,prebuild=cd jni && sh prep_build.sh,buildjni=yes
+Build:1.9.18.3,98
+    commit=v1.9.18.3
+    prebuild=cd jni && \
+        wget http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/sha2-07-01-07.zip && \
+        unzip sha2-07-01-07.zip -d sha && \
+        cd ..
+    buildjni=yes
+
+Build:1.98.1,111
+    commit=v1.98.1
+    prebuild=cd jni && \
+        wget http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/sha2-07-01-07.zip && \
+        unzip sha2-07-01-07.zip -d sha && \
+        cd ..
+    buildjni=yes
+
+Build:1.99.2,116
+    commit=v1.99.2
+    prebuild=cd jni && \
+        wget http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/sha2-07-01-07.zip && \
+        unzip sha2-07-01-07.zip -d sha
+    buildjni=yes
+
+Build:1.99.4,120
+    commit=v1.99.4
+    prebuild=cd jni && \
+        wget http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/sha2-07-01-07.zip && \
+        unzip sha2-07-01-07.zip -d sha
+    buildjni=yes
+
+Build:1.99.5,121
+    commit=v1.99.5
+    target=android-12
+    prebuild=cd jni && \
+        wget http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/sha2-07-01-07.zip && \
+        unzip sha2-07-01-07.zip -d sha
+    buildjni=yes
+
+Build:1.99.6,122
+    commit=v1.99.6
+    extlibs=keepass/sha2-07-01-07.zip
+    prebuild=unzip libs/sha2-07-01-07.zip -d jni/sha && \
+        rm libs/sha2-07-01-07.zip
+    buildjni=yes
+
+Build:1.99.7.2,125
+    commit=v1.99.7.2
+    extlibs=keepass/sha2-07-01-07.zip
+    prebuild=unzip libs/sha2-07-01-07.zip -d jni/sha && \
+        rm libs/sha2-07-01-07.zip
+    buildjni=yes
+
+Build:1.99.8,126
+    commit=v1.99.8
+    extlibs=keepass/sha2-07-01-07.zip
+    prebuild=unzip libs/sha2-07-01-07.zip -d jni/sha && \
+        rm libs/sha2-07-01-07.zip
+    buildjni=yes
+
+Build:1.99.9,127
+    commit=v1.99.9
+    extlibs=keepass/sha2-07-01-07.zip
+    prebuild=unzip libs/sha2-07-01-07.zip -d jni/sha && \
+        rm libs/sha2-07-01-07.zip
+    buildjni=yes
+
+Build:1.99.10,128
+    commit=1.99.10
+    target=android-12
+    prebuild=cd jni && \
+        sh prep_build.sh
+    buildjni=yes
 
 Auto Update Mode:None
 #Sometimes a beta