diff --git a/Makefile b/Makefile
index 13f07ff33..8d30e3821 100644
--- a/Makefile
+++ b/Makefile
@@ -35,13 +35,13 @@ ENABLE_GPL_THIRD_PARTIES=1
 ifeq ($(ENABLE_GPL_THIRD_PARTIES),1)
 BUILD_X264=1
 BUILD_G729=1
-BUILD_ZRTP=1
+BUILD_GPLV3_ZRTP=1
 else
 #x264 and g729 requires additional licensing agreements.
 BUILD_X264=0
 BUILD_G729=0
 #zrtpcpp is GPL.
-BUILD_ZRTP=0
+BUILD_GPLV3_ZRTP=0
 endif
 
 NDK_DEBUG=0
@@ -252,7 +252,7 @@ endif
 #	@cd $(TOPDIR)/submodules/externals/libzrtpcpp/ && \
 #	cp ../build/libzrtpcpp/libzrtpcpp-config.h . \
 	|| ( echo "ZRTP prepare state failed." ; exit 1 )
-#ifeq ($(BUILD_ZRTP), 1)
+#ifeq ($(BUILD_GPLV3_ZRTP), 1)
 #prepare-zrtp: $(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h
 #else
 prepare-zrtp:
@@ -334,7 +334,7 @@ prepare-sources: build-ffmpeg build-x264 prepare-ilbc build-vpx prepare-silk pre
 GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
 	BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \
 	BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) \
-	BUILD_UPNP=$(BUILD_UPNP) BUILD_ZRTP=$(BUILD_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC)
+	BUILD_UPNP=$(BUILD_UPNP) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC)
 
 
 LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \
diff --git a/jni/Android.mk b/jni/Android.mk
index 0a5ddaf5e..60f60f0c2 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -17,7 +17,7 @@ endif
 endif
 
 
-ifeq ($(BUILD_ZRTP), 1)
+ifeq ($(BUILD_GPLV3_ZRTP), 1)
 	BUILD_SRTP=1
 ZRTP_C_INCLUDE= \
 	$(linphone-root-dir)/submodules/externals/libzrtpcpp/zrtp \
@@ -95,7 +95,7 @@ include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk
 endif #_BUILD_VIDEO
 
 
-ifeq ($(BUILD_ZRTP), 1)
+ifeq ($(BUILD_GPLV3_ZRTP), 1)
 ifeq (,$(DUMP_VAR))
 $(info $(TARGET_ARCH_ABI): Build ZRTP support)
 endif
diff --git a/jni/Application.mk b/jni/Application.mk
index f5e00dc75..6a4e216ac 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -114,7 +114,7 @@ APP_MODULES += libtunnelclient
 endif
 endif
 
-ifeq ($(BUILD_ZRTP), 1)
+ifeq ($(BUILD_GPLV3_ZRTP), 1)
 APP_MODULES      += libzrtpcpp
 endif
 
diff --git a/project.properties b/project.properties
index 019cc5583..a2bff5858 100644
--- a/project.properties
+++ b/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-18
 android.library=false
diff --git a/submodules/linphone b/submodules/linphone
index c2ca9f8c0..f0250b5a5 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit c2ca9f8c089b1b6ed8e7bc1f2bfa8d5a5defc524
+Subproject commit f0250b5a5fb9cb6a2bbf0432f7b4bb352189dafe