diff --git a/cmake/LinphoneConfig.cmake.in b/cmake/LinphoneConfig.cmake.in
index 9bcd9dfa4..b636612a5 100644
--- a/cmake/LinphoneConfig.cmake.in
+++ b/cmake/LinphoneConfig.cmake.in
@@ -41,7 +41,11 @@ endif()
 
 get_filename_component(LINPHONE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 set(LINPHONE_INCLUDE_DIRS "${LINPHONE_CMAKE_DIR}/../../../include")
-set(LINPHONE_LIBRARIES linphone)
+if(@ENABLE_SHARED@)
+	set(LINPHONE_LIBRARIES linphone)
+else()
+	set(LINPHONE_LIBRARIES linphone-static)
+endif()
 set(LINPHONE_LDFLAGS @LINK_FLAGS@)
 list(APPEND LINPHONE_INCLUDE_DIRS ${MEDIASTREAMER2_INCLUDE_DIRS} ${BELLESIP_INCLUDE_DIRS})
 list(APPEND LINPHONE_LIBRARIES ${MEDIASTREAMER2_LIBRARIES} ${BELLESIP_LIBRARIES})
diff --git a/mediastreamer2 b/mediastreamer2
index 83ace6b88..685beb165 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 83ace6b88dfa819b04c2dc6bca21961f457c90d6
+Subproject commit 685beb165ee050e38ea33eb0e4a1d6a87f7b5520
diff --git a/oRTP b/oRTP
index 92b6ef1cf..de0aee3f2 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 92b6ef1cf4884699f07a212f8ceeb06f284fae2c
+Subproject commit de0aee3f2024cfd1a24fee5f4ed56be5a2032206