diff --git a/Makefile b/Makefile
index 8b5aae738..8ef65b933 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ prepare-mediastreamer2:
 prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2
 
 generate-libs:
-	$(NDK_PATH)/ndk-build LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_SILK=1 BUILD_AMRNB=full BUILD_GPLV3_ZRTP=1 -j$(NUMCPUS)
+	$(NDK_PATH)/ndk-build LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_SILK=1 BUILD_AMRNB=full BUILD_GPLV3_ZRTP=1 USE_JAVAH=1 -j$(NUMCPUS)
 
 update-project:
 	$(SDK_PATH)/android update project --path .
diff --git a/submodules/linphone b/submodules/linphone
index 6b8931181..fe595857d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 6b89311813fd2721c48cd793176e02650eea69fb
+Subproject commit fe595857dddfadb85df51af67620f035e7651c7d