diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt
index ae25e522a8..206e753e7b 100644
--- a/metadata/org.linphone.txt
+++ b/metadata/org.linphone.txt
@@ -21,47 +21,48 @@ Description:
 Repo Type:git
 Repo:git://git.linphone.org/linphone-android.git
 
-Build Version:2.0.3-fdroid,2003,!contains non-free codecs at 2.0.3-1,submodules=no,\
-init=git submodule update --init --recursive,prebuild=\
-rm -rf tests submodules/externals/webrtc/modules/\
-video_capture/main/source/android/java/org/webrtc/videoengine/* && \
-echo "version.name=2.0.3-fdroid" > default.properties && \
-sed -i 's/allowBackup=\"true\"/debuggable=\"false\"/g' AndroidManifest.xml && \
-sed -i 's@\(NDK_PATH=\).*@\1$$NDK$$@' Makefile && \
-sed -i 's/markets\">true/markets\">=false/g' \
-res/values/non_localizable_custom.xml,build=\
-make BUILD_SILK=0 BUILD_X264=1 BUILD_GPLV3_ZRTP=1 \
-BUILD_FOR_X86=1 prepare-sources,buildjni=no
+Build:2.0.3-fdroid,2003
+    disable=contains non-free codecs at 2.0.3-1
+    commit=2.0.3-1
+    init=git submodule update --init --recursive
+    prebuild=rm -rf tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/* && \
+        echo "version.name=2.0.3-fdroid" > default.properties && \
+        sed -i 's/allowBackup=\"true\"/debuggable=\"false\"/g' AndroidManifest.xml && \
+        sed -i 's@\(NDK_PATH=\).*@\1$$NDK$$@' Makefile && \
+        sed -i 's/markets\">true/markets\">=false/g' res/values/non_localizable_custom.xml
+    build=make BUILD_SILK=0 BUILD_X264=1 BUILD_GPLV3_ZRTP=1 BUILD_FOR_X86=1 prepare-sources
+    buildjni=no
+
 # note the custom_rules ; didn't use a tag because of zrtp security fix
-Build Version:2.1.2-fdroid,2120,846a2a3a58,\
-update=no,\
-init=git submodule update --init --recursive,\
-patch=makefile.patch,\
-prebuild=sed -i '1 i NDK_PATH=$$NDK$$\nSDK_PATH=$$SDK$$/tools\n\
-SDK_PLATFORM_TOOLS_PATH=$$SDK$$/platform-tools\n' Makefile && \
-         echo 'version.name=2.1.2-fdroid' > default.properties && \
-         rm -rf tests submodules/externals/webrtc/modules/\
-video_capture/main/source/android/java/org/webrtc/videoengine/* && \
-         sed -i 's/allowBackup="true"/debuggable="false"/g' AndroidManifest.xml && \
-         sed -i 's/markets">true/markets">=false/g' res/values/non_localizable_custom.xml,\
-build=make,\
-buildjni=no
-Build Version:2.2.0.2-fdroid,2202,!wip - just needs new makefile patch at 1c3e19eb983,\
-update=no,\
-init=git submodule update --init --recursive,\
-patch=makefile.patch,\
-prebuild=sed -i '1 i NDK_PATH=$$NDK$$\nSDK_PATH=$$SDK$$/tools\n\
-SDK_PLATFORM_TOOLS_PATH=$$SDK$$/platform-tools\n' Makefile && \
-         echo 'version.name=2.2.0.2-fdroid' > default.properties && \
-         rm -rf tests submodules/externals/webrtc/modules/\
-video_capture/main/source/android/java/org/webrtc/videoengine/* && \
-         sed -i 's/allowBackup="true"/debuggable="false"/g' AndroidManifest.xml && \
-         sed -i 's/markets">true/markets">=false/g' res/values/non_localizable_custom.xml,\
-build=make,\
-buildjni=no
+Build:2.1.2-fdroid,2120
+    commit=846a2a3a58
+    init=git submodule update --init --recursive
+    update=no
+    patch=makefile.patch
+    prebuild=sed -i '1 i NDK_PATH=$$NDK$$\nSDK_PATH=$$SDK$$/tools\nSDK_PLATFORM_TOOLS_PATH=$$SDK$$/platform-tools\n' Makefile && \
+        echo 'version.name=2.1.2-fdroid' > default.properties && \
+        rm -rf tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/* && \
+        sed -i 's/allowBackup="true"/debuggable="false"/g' AndroidManifest.xml && \
+        sed -i 's/markets">true/markets">=false/g' res/values/non_localizable_custom.xml
+    build=make
+    buildjni=no
+
+Build:2.2.0.2-fdroid,2202
+    disable=wip - just needs new makefile patch at 1c3e19eb983
+    commit=1c3e19eb983
+    init=git submodule update --init --recursive
+    update=no
+    patch=makefile.patch
+    prebuild=sed -i '1 i NDK_PATH=$$NDK$$\nSDK_PATH=$$SDK$$/tools\nSDK_PLATFORM_TOOLS_PATH=$$SDK$$/platform-tools\n' Makefile && \
+        echo 'version.name=2.2.0.2-fdroid' > default.properties && \
+        rm -rf tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/* && \
+        sed -i 's/allowBackup="true"/debuggable="false"/g' AndroidManifest.xml && \
+        sed -i 's/markets">true/markets">=false/g' res/values/non_localizable_custom.xml
+    build=make
+    buildjni=no
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.2.0.2
-Current Version Code:2202
+Current Version:Unknown
+Current Version Code:2211