diff --git a/Makefile b/Makefile
index 29b26e79d..52f0c9015 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ SDK_PATH=$(shell dirname `which android`)
 NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" )
 TOPDIR=$(shell pwd)
 PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
+LINPHONE_VERSION=$(shell cat submodules/linphone/configure.ac | grep -m 1 "LINPHONE_VERSION=" | sed -e 's/LINPHONE_VERSION=//')
 KEYSTORE=bc-android.keystore
 KEYALIAS=nw8000
 
@@ -48,7 +49,7 @@ prepare-mediastreamer2:
 prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2
 
 generate-libs: 
-	$(NDK_PATH)/ndk-build BUILD_SILK=1 BUILD_AMRNB=full -j$(NUMCPUS)
+	$(NDK_PATH)/ndk-build LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_SILK=1 BUILD_AMRNB=full -j$(NUMCPUS)
 
 update-project:
 	$(SDK_PATH)/android update project --path .
diff --git a/src/org/linphone/setup/GenericLoginFragment.java b/src/org/linphone/setup/GenericLoginFragment.java
index 216d389a0..7de4c705a 100644
--- a/src/org/linphone/setup/GenericLoginFragment.java
+++ b/src/org/linphone/setup/GenericLoginFragment.java
@@ -23,8 +23,8 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Toast;
diff --git a/submodules/linphone b/submodules/linphone
index 271814cdf..5f2640d57 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 271814cdfb76fa4fa1407d4b6ab9aa924b792d09
+Subproject commit 5f2640d57a48e122cb14ffa2df23304103e3d6a9