diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt
index c87d3c75fe..8058243841 100644
--- a/metadata/org.linphone.txt
+++ b/metadata/org.linphone.txt
@@ -24,7 +24,7 @@ Repo:git://git.linphone.org/linphone-android.git
 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
+    submodules=yes
     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 && \
@@ -36,7 +36,7 @@ Build:2.0.3-fdroid,2003
 # note the custom_rules ; didn't use a tag because of zrtp security fix
 Build:2.1.2-fdroid,2120
     commit=846a2a3a58
-    init=git submodule update --init --recursive
+    submodules=yes
     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 && \
@@ -50,7 +50,7 @@ Build:2.1.2-fdroid,2120
 Build:2.2.0.2-fdroid,2202
     disable=wip - just needs new makefile patch at 1c3e19eb983
     commit=1c3e19eb983
-    init=git submodule update --init --recursive
+    submodules=yes
     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 && \
@@ -68,7 +68,7 @@ Build:2.2.1.1,2211
     target=android-17
     prebuild=rm -rf submodules/mssilk/ios_bin tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/* && \
         sed -i -e 's/android:versionCode/android:versionName="2.2.1.1" android:versionCode/' -e 's/allowBackup/debuggable="false" allowBackup/' AndroidManifest.xml
-    build=make prepare-sources BUILD_SILK=0 BUILD_AMRNB=light BUILD_GPLV3_ZRTP=1 BUILD_G729=0 BUILD_TUNNEL=0
+    build=make generate-libs BUILD_SILK=0 BUILD_AMRNB=light BUILD_GPLV3_ZRTP=1 BUILD_G729=0 BUILD_TUNNEL=0
     buildjni=no
 
 Auto Update Mode:None