diff --git a/coreapi/help/CMakeLists.txt b/coreapi/help/CMakeLists.txt
index 87246057759c985fe17097417e39e54bf288dcbf..0b9e3b3fa5527f96038d20e0d0d7ad0ec7c5a013 100644
--- a/coreapi/help/CMakeLists.txt
+++ b/coreapi/help/CMakeLists.txt
@@ -73,7 +73,7 @@ if (ENABLE_TOOLS)
 		string(REPLACE ".c" "" EXECUTABLE_NAME ${EXECUTABLE})
 		bc_apply_compile_flags(${EXECUTABLE} STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
 		add_executable(${EXECUTABLE_NAME} ${USE_BUNDLE} ${EXECUTABLE})
-		target_link_libraries(${EXECUTABLE_NAME} ${LINPHONE_LIBS_FOR_TOOLS} ${MEDIASTREAMER2_LIBRARIES})
+		target_link_libraries(${EXECUTABLE_NAME} ${LINPHONE_LIBS_FOR_TOOLS} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES})
 		set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
 		if (NOT IOS)
 			install(TARGETS ${EXECUTABLE_NAME}
diff --git a/mediastreamer2 b/mediastreamer2
index 2da064b15bcaf9a4a99661bd5f74a076ef403bcd..4a3adb044fd6246bcd837af2410756bda9a45b5b 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 2da064b15bcaf9a4a99661bd5f74a076ef403bcd
+Subproject commit 4a3adb044fd6246bcd837af2410756bda9a45b5b
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 36e56d6ce570219a7224bd32b5a5c5aa2257fb21..a4403e9744f149af1bd817d2ca4826162500383f 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -33,7 +33,7 @@ endif()
 set(LP_AUTO_ANSWER_SOURCE_FILES	auto_answer.c)
 bc_apply_compile_flags(LP_AUTO_ANSWER_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
 add_executable(lp-auto-answer ${USE_BUNDLE} ${LP_AUTO_ANSWER_SOURCE_FILES})
-target_link_libraries(lp-auto-answer ${LINPHONE_LIBS_FOR_TOOLS} ${MEDIASTREAMER2_LIBRARIES})
+target_link_libraries(lp-auto-answer ${LINPHONE_LIBS_FOR_TOOLS} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${BCTOOLBOX_LIBRARIES})
 set_target_properties(lp-auto-answer PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
 
 set(LP_SENDMSG_SOURCE_FILES lpsendmsg.c)