diff --git a/mediastreamer2 b/mediastreamer2
index dbd591809..22417d986 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit dbd5918096518feaf9a3be55ca7a834fa4dafe18
+Subproject commit 22417d98696e4368c314efe862caaf8c62845b85
diff --git a/wrappers/cpp/LinphoneCxxConfig.cmake.in b/wrappers/cpp/LinphoneCxxConfig.cmake.in
index c3a0f08d2..6bc4fb433 100644
--- a/wrappers/cpp/LinphoneCxxConfig.cmake.in
+++ b/wrappers/cpp/LinphoneCxxConfig.cmake.in
@@ -29,23 +29,21 @@
 #  LINPHONECXX_INCLUDE_DIRS - the linphone++ include directory
 #  LINPHONECXX_LIBRARIES - The libraries needed to use linphone++
 #  LINPHONECXX_LDFLAGS - The linking flags needed to use linphone++
-if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
-        include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
-        include("${EP_bellesip_CONFIG_DIR}/BelleSIPConfig.cmake")
-else()
-        find_package(BelleSIP)
-        find_package(Linphone)
+if (NOT LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+	include("${CMAKE_CURRENT_LIST_DIR}/LinphoneCxxTargets.cmake")
 endif()
-
-include("${CMAKE_CURRENT_LIST_DIR}/LinphoneCxxTargets.cmake")
 set(LINPHONECXX_LDFLAGS "")
 set(LINPHONECXX_CPPFLAGS "")
 set(LINPHONECXX_LIBRARIES linphone++)
 
 #get_target_property(LINPHONECXX_INCLUDE_DIRS linphone++ INTERFACE_INCLUDE_DIRECTORIES)
 #list(INSERT LINPHONECXX_INCLUDE_DIRS 0 "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
-set(LINPHONECXX_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+        list(APPEND LINPHONECXX_INCLUDE_DIRS "@CMAKE_CURRENT_BINARY_DIR@/include")
+        list(APPEND LINPHONECXX_INCLUDE_DIRS "${EP_linphone_INCLUDE_DIR}/../wrappers/cpp") 
+else()
+	set(LINPHONECXX_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+endif()
 list(REMOVE_DUPLICATES LINPHONECXX_INCLUDE_DIRS)
 
 set(LINPHONECXX_FOUND 1)
-