diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 014e5607a..7508e559c 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -220,7 +220,11 @@ if(ENABLE_SHARED)
         	endif()
 	endif()
 
-	set_target_properties(linphone PROPERTIES VERSION ${LINPHONE_SO_VERSION} LINKER_LANGUAGE CXX)
+	set_target_properties(linphone PROPERTIES LINKER_LANGUAGE CXX)
+	if(NOT ANDROID)
+		# Do not version shared library on Android
+		set_target_properties(linphone PROPERTIES SOVERSION ${LINPHONE_SO_VERSION})
+	endif()
 	add_dependencies(linphone liblinphone-git-version)
 	target_link_libraries(linphone ${LIBS})
 	if(WIN32 AND CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
diff --git a/mediastreamer2 b/mediastreamer2
index a92131c89..fa24800c1 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a92131c8910bed9e05ec42a00620299f33d85d05
+Subproject commit fa24800c16f779e5a252780131e9cfb1367b72ed
diff --git a/oRTP b/oRTP
index 5e99cf5ec..40feb7a50 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 5e99cf5ec6b548d08f132c19f5f2f4d285c378ad
+Subproject commit 40feb7a5001060c6d13d563880828be59ff0381a