diff --git a/metadata/org.helllabs.android.xmp.txt b/metadata/org.helllabs.android.xmp.txt
index 3e317f4dac..657f5b554f 100644
--- a/metadata/org.helllabs.android.xmp.txt
+++ b/metadata/org.helllabs.android.xmp.txt
@@ -19,35 +19,96 @@ Repo:git://git.code.sf.net/p/xmp/xmp-android
 
 # This is one of those projects that put the changelog in the version
 # number, so fix that with forceversion.
-Build Version:2.1.0,15,639549fda2111cb800fabe468b4a64bf4ae27003,\
-buildjni=yes,subdir=src/android/project,target=android-8,\
-forceversion=yes
-Build Version:2.9.0,21,03a9c9c9d5acf3b1b659e407c18d072309d50e3a,\
-init=cd ../../ && autoconf && ./configure,buildjni=yes,subdir=players/android,target=android-14,\
-forceversion=yes
-Build Version:3.2.0,30,2c7b8dd28dff53b876ad19498d0f634805fd0a2,\
-init=cd ../../ && autoconf && ./configure,buildjni=yes,subdir=players/android,target=android-14
-Build Version:3.2.1,31,android-3.2.1,\
-init=cd ../../ && autoconf && ./configure,buildjni=yes,subdir=players/android,target=android-14
-Build Version:3.4.2,35,android-3.4.2,buildjni=yes,target=android-14,init=cd ../../ && autoconf && ./configure,subdir=players/android
-Build Version:3.4.3,36,android-3.4.3,subdir=players/android,buildjni=yes,target=android-14,init=\
-cd ../../ && autoconf && ./configure
-Build Version:3.5.0,38,android-3.5.0,target=android-17,init=\
-cd jni && git clone git://git.code.sf.net/p/xmp/libxmp xmp-libxmp && \
-ln -fs xmp-libxmp/include include && ln -fs xmp-libxmp/src src && \
-sed -i 's/..\/..\/libxmp/xmp-libxmp/g' Android.mk && cd xmp-libxmp && \
-autoconf && ./configure,prebuild=sed -i 's/android:minSdkVersion=\"3\"/\
-android:minSdkVersion=\"4\"/g;10d' AndroidManifest.xml,buildjni=yes
-Build Version:3.6.0,39,android-3.6.0,\
-target=android-17,srclibs=Libxmp@libxmp-4.1.0,prebuild=\
-sed -i 's/android:minSdkVersion=\"3\"/\
-android:minSdkVersion=\"4\"/g;/supports-screens/d' AndroidManifest.xml && \
-cd jni && cp -r ../../extlib/Libxmp . && \
-ln -fs Libxmp/include include && ln -fs Libxmp/src src && \
-sed -i 's/..\/..\/libxmp/Libxmp/g' Android.mk && cd Libxmp && \
-autoconf && ./configure,buildjni=yes
+Build:2.1.0,15
+    commit=639549fda2111cb800fabe468b4a64bf4ae27003
+    subdir=src/android/project
+    target=android-8
+    forceversion=yes
+    buildjni=yes
+
+Build:2.9.0,21
+    commit=03a9c9c9d5acf3b1b659e407c18d072309d50e3a
+    subdir=players/android
+    init=cd ../../ && \
+        autoconf && \
+        ./configure
+    target=android-14
+    forceversion=yes
+    buildjni=yes
+
+Build:3.2.0,30
+    commit=2c7b8dd28dff53b876ad19498d0f634805fd0a2
+    subdir=players/android
+    init=cd ../../ && \
+        autoconf && \
+        ./configure
+    target=android-14
+    buildjni=yes
+
+Build:3.2.1,31
+    commit=android-3.2.1
+    subdir=players/android
+    init=cd ../../ && \
+        autoconf && \
+        ./configure
+    target=android-14
+    buildjni=yes
+
+Build:3.4.2,35
+    commit=android-3.4.2
+    subdir=players/android
+    init=cd ../../ && \
+        autoconf && \
+        ./configure
+    target=android-14
+    buildjni=yes
+
+Build:3.4.3,36
+    commit=android-3.4.3
+    subdir=players/android
+    init=cd ../../ && \
+        autoconf && \
+        ./configure
+    target=android-14
+    buildjni=yes
+
+Build:3.5.0,38
+    commit=android-3.5.0
+    init=cd jni && \
+        git clone git://git.code.sf.net/p/xmp/libxmp xmp-libxmp && \
+        ln -fs xmp-libxmp/include include && \
+        ln -fs xmp-libxmp/src src && \
+        sed -i 's/..\/..\/libxmp/xmp-libxmp/g' Android.mk && \
+        cd xmp-libxmp && \
+        autoconf && \
+        ./configure
+    target=android-17
+    prebuild=sed -i 's/android:minSdkVersion=\"3\"/android:minSdkVersion=\"4\"/g;10d' AndroidManifest.xml
+    buildjni=yes
+
+Build:3.6.0,39
+    commit=android-3.6.0
+    target=android-17
+    srclibs=Libxmp@libxmp-4.1.0
+    prebuild=sed -i 's/android:minSdkVersion=\"3\"/android:minSdkVersion=\"4\"/g;/supports-screens/d' AndroidManifest.xml && \
+        cd jni && \
+        cp -r ../../extlib/Libxmp . && \
+        ln -fs Libxmp/include include && \
+        ln -fs Libxmp/src src && \
+        sed -i 's/..\/..\/libxmp/Libxmp/g' Android.mk && \
+        cd Libxmp && \
+        autoconf && \
+        ./configure
+    buildjni=yes
+
+Build:3.6.2,41
+    commit=android-3.6.2
+    disable=requires libxmp 4.1.6-pre but no such version is tagged
+
+Maintainer Notes:
+See changelog (in res/values/strings.xml) to determine libxmp version.
+.
 
-# See res/values/strings.xml to determine Libxmp version
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:3.6.2