diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dea97796..0d34e4890 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,31 +3,6 @@ project(LINPHONE C)
 
 option(LINPHONE_ENABLE_VIDEO "Build linphone with video support." ON)
 
-if(NOT ORTP_ROOT_DIR)
-	set(ORTP_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/oRTP)
-endif()
-if(NOT ORTP_INCLUDE_DIR)
-	set(ORTP_INCLUDE_DIR ${ORTP_ROOT_DIR}/include)
-endif()
-if(NOT MS2_ROOT_DIR)
-	set(MS2_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/mediastreamer2)
-endif()
-if(NOT MS2_INCLUDE_DIR)
-	set(MS2_INCLUDE_DIR ${MS2_ROOT_DIR}/include)
-endif()
-if(NOT LIBXML2_ROOT_DIR)
-	set(LIBXML2_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libxml2)
-endif()
-if(NOT LIBXML2_INCLUDE_DIR)
-	set(LIBXML2_INCLUDE_DIR ${LIBXML2_ROOT_DIR}/include)
-endif()
-if(NOT BELLESIP_ROOT_DIR)
-	set(BELLESIP_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../belle-sip)
-endif()
-if(NOT BELLESIP_INCLUDE_DIR)
-	set(BELLESIP_INCLUDE_DIR ${BELLESIP_ROOT_DIR}/include)
-endif()
-
 include_directories(
 	include/
 	coreapi/
@@ -35,26 +10,10 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../cmake/libxml2/
 )
 
-if(USE_INSTALLED_COMPONENTS)
-	include_directories(
-		${CMAKE_INSTALL_PREFIX}/include
-		${CMAKE_INSTALL_PREFIX}/include/libxml2
-	)
-else()
-	include_directories(
-		${ORTP_INCLUDE_DIR}
-		${MS2_INCLUDE_DIR}
-		${LIBXML2_INCLUDE_DIR}
-		${BELLESIP_INCLUDE_DIR}
-	)
-	if(WIN32)
-		include_directories(${ORTP_ROOT_DIR}/build/vsx/oRTP/oRTP/)
-	endif(WIN32)
-endif()
+include_directories(
+	${CMAKE_INSTALL_PREFIX}/include
+	${CMAKE_INSTALL_PREFIX}/include/libxml2
+)
 
 add_subdirectory(coreapi)
 add_subdirectory(share)
-
-if(INSTALL_COMPONENT_IN_POSTBUILD)
-	add_install_target(INSTALL_liblinphone COMP_liblinphone liblinphone)
-endif()
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 7dcefb8ca..b608e4bfb 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -1,3 +1,9 @@
+find_library(LIBORTP NAMES ortp)
+find_library(LIBMEDIASTREAMER_BASE NAMES mediastreamer_base)
+find_library(LIBMEDIASTREAMER_VOIP NAMES mediastreamer_voip)
+find_library(LIBBELLESIP NAMES bellesip)
+find_library(LIBXML2 NAMES xml2)
+
 find_program(GIT git)
 
 set(GIT_VERSION "unknown")
@@ -91,7 +97,6 @@ add_definitions(
 	-DIN_LINPHONE
 	-DUSE_BELLESIP
 	#-DTUNNEL_ENABLED
-	#-DVIDEO_ENABLED
 	-DLINPHONE_PACKAGE_NAME="linphone"
 	-DLINPHONE_VERSION="Devel"
 	-DLIBLINPHONE_EXPORTS
@@ -110,39 +115,28 @@ add_definitions(
 
 set(LIBS ws2_32)
 endif(WIN32)
-set(LIBS ${LIBS} libortp libmediastreamer_base libmediastreamer_voip libbellesip libxml2)
+set(LIBS ${LIBS} ${LIBORTP} ${LIBMEDIASTREAMER_BASE} ${LIBMEDIASTREAMER_VOIP} ${LIBBELLESIP} ${LIBXML2})
 
-add_library(liblinphone SHARED ${SOURCE_FILES})
-set_target_properties(liblinphone PROPERTIES VERSION 3.6.99 SOVERSION 5)
+add_library(linphone SHARED ${SOURCE_FILES})
+set_target_properties(linphone PROPERTIES VERSION 3.6.99 SOVERSION 5)
 
-target_link_libraries(liblinphone ${LIBS})
+target_link_libraries(linphone ${LIBS})
 
-install(TARGETS liblinphone
-		COMPONENT COMP_liblinphone
+install(TARGETS linphone
         DESTINATION ${LIB_INSTALL_DIR}
         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
-if(USE_INSTALLED_COMPONENTS)
-	add_dependencies(liblinphone
-		INSTALL_libortp
-		INSTALL_libmediastreamer2
-		INSTALL_libbellesip
-		INSTALL_libxml2)
-endif()
-
 
 
 file(GLOB HEADER_FILES "*.h")
 
 install(FILES ${HEADER_FILES}
-	COMPONENT COMP_liblinphone
 	DESTINATION include/linphone
 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
 )
 if(WIN32)
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/liblinphone.pdb
-	COMPONENT COMP_liblinphone
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/linphone.pdb
 	DESTINATION ${LIB_INSTALL_DIR}
 	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )
diff --git a/mediastreamer2 b/mediastreamer2
index b413084e4..e3e7cad4c 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit b413084e4e112f26b90154b4c801ec74256d42fa
+Subproject commit e3e7cad4c0737982c100518acda3a95abf168038
diff --git a/oRTP b/oRTP
index b46d5762b..aca5bcf65 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit b46d5762ba3ed86722651d8caf9711522f08ee0f
+Subproject commit aca5bcf65ee64806db02caadb4d4bc1c99a47775