diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc9ae59173ce758172bf11f14f35dda078edce5a..b9e2d1fbea9ed531029efed2149ea5df142ac07a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ option(ENABLE_SHARED "Build shared library." YES)
 option(ENABLE_STATIC "Build static library." YES)
 option(ENABLE_CONSOLE_UI "Turn on or off compilation of console interface." YES)
 option(ENABLE_DATE "Use build date in internal version number." NO)
+option(ENABLE_DAEMON "Enable the linphone daemon interface." YES)
 option(ENABLE_DOC "Enable documentation generation with Doxygen." YES)
 option(ENABLE_GTK_UI "Turn on or off compilation of gtk interface." YES)
 option(ENABLE_LDAP "Enable LDAP support." NO)
@@ -295,6 +296,9 @@ add_subdirectory(share)
 if(ENABLE_CONSOLE_UI)
 	add_subdirectory(console)
 endif()
+if(ENABLE_DAEMON)
+	add_subdirectory(daemon)
+endif()
 if(ENABLE_GTK_UI)
 	add_subdirectory(gtk)
 	add_subdirectory(pixmaps)
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8d2fbc8df03bc60e1cec1ad5de369c64a6b6c2f9
--- /dev/null
+++ b/daemon/CMakeLists.txt
@@ -0,0 +1,129 @@
+############################################################################
+# CMakeLists.txt
+# Copyright (C) 2016  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+############################################################################
+
+set(DAEMON_SOURCE_FILES
+	commands/adaptive-jitter-compensation.cc
+	commands/adaptive-jitter-compensation.h
+	commands/answer.cc
+	commands/answer.h
+	commands/audio-codec-get.cc
+	commands/audio-codec-get.h
+	commands/audio-codec-move.cc
+	commands/audio-codec-move.h
+	commands/audio-codec-set.cc
+	commands/audio-codec-set.h
+	commands/audio-codec-toggle.cc
+	commands/audio-codec-toggle.h
+	commands/audio-stream-start.cc
+	commands/audio-stream-start.h
+	commands/audio-stream-stats.cc
+	commands/audio-stream-stats.h
+	commands/audio-stream-stop.cc
+	commands/audio-stream-stop.h
+	commands/auth-infos-clear.cc
+	commands/auth-infos-clear.h
+	commands/call.cc
+	commands/call.h
+	commands/call-mute.cc
+	commands/call-mute.h
+	commands/call-pause.cc
+	commands/call-pause.h
+	commands/call-resume.cc
+	commands/call-resume.h
+	commands/call-stats.cc
+	commands/call-stats.h
+	commands/call-status.cc
+	commands/call-status.h
+	commands/call-transfer.cc
+	commands/call-transfer.h
+	commands/cn.cc
+	commands/cn.h
+	commands/conference.cc
+	commands/conference.h
+	commands/config.cc
+	commands/configcommand.h
+	commands/contact.cc
+	commands/contact.h
+	commands/dtmf.cc
+	commands/dtmf.h
+	commands/firewall-policy.cc
+	commands/firewall-policy.h
+	commands/help.cc
+	commands/help.h
+	commands/ipv6.cc
+	commands/ipv6.h
+	commands/jitterbuffer.cc
+	commands/jitterbuffer.h
+	commands/media-encryption.cc
+	commands/media-encryption.h
+	commands/msfilter-add-fmtp.cc
+	commands/msfilter-add-fmtp.h
+	commands/netsim.cc
+	commands/netsim.h
+	commands/play-wav.cc
+	commands/play-wav.h
+	commands/pop-event.cc
+	commands/pop-event.h
+	commands/port.cc
+	commands/port.h
+	commands/ptime.cc
+	commands/ptime.h
+	commands/quit.cc
+	commands/quit.h
+	commands/register.cc
+	commands/register.h
+	commands/register-status.cc
+	commands/register-status.h
+	commands/terminate.cc
+	commands/terminate.h
+	commands/unregister.cc
+	commands/unregister.h
+	commands/version.cc
+	commands/version.h
+	commands/video.cc
+	commands/video.h
+	daemon.cc
+	daemon.h
+)
+
+set(DAEMON_PIPETEST_SOURCE_FILES
+	daemon-pipetest.c
+)
+
+apply_compile_flags(DAEMON_SOURCE_FILES "CPP" "CXX")
+apply_compile_flags(DAEMON_PIPETEST_SOURCE_FILES "CPP" "C")
+
+add_executable(linphone-daemon ${DAEMON_SOURCE_FILES})
+target_include_directories(linphone-daemon PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(linphone-daemon linphone)
+
+add_executable(linphone-daemon-pipetest ${DAEMON_PIPETEST_SOURCE_FILES})
+target_link_libraries(linphone-daemon-pipetest linphone)
+
+set(INSTALL_TARGETS linphone-daemon linphone-daemon-pipetest)
+
+install(TARGETS ${INSTALL_TARGETS}
+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+)
diff --git a/daemon/commands/audio-codec-get.cc b/daemon/commands/audio-codec-get.cc
index 48bd25f05214b319d4f3d11d285499852d0e2143..357525b05fbafb3c750afc22625b6d906ff55951 100644
--- a/daemon/commands/audio-codec-get.cc
+++ b/daemon/commands/audio-codec-get.cc
@@ -54,7 +54,7 @@ void AudioCodecGetCommand::exec(Daemon *app, const char *args) {
 	}
 
 	int index = 0;
-	for (const MSList *node = linphone_core_get_audio_codecs(app->getCore()); node != NULL; node = ms_list_next(node)) {
+	for (const bctbx_list_t *node = linphone_core_get_audio_codecs(app->getCore()); node != NULL; node = bctbx_list_next(node)) {
 		PayloadType *payload = reinterpret_cast<PayloadType*>(node->data);
 		if (list) {
 			ost << PayloadTypeResponse(app->getCore(), payload, index).getBody() << "\n";
diff --git a/daemon/commands/audio-codec-move.cc b/daemon/commands/audio-codec-move.cc
index 3d65f91135ba27525cf995a8b940e44b07eb473e..82816ac9006d13ffce0da3a06c0c77723aab21f3 100644
--- a/daemon/commands/audio-codec-move.cc
+++ b/daemon/commands/audio-codec-move.cc
@@ -65,21 +65,21 @@ void AudioCodecMoveCommand::exec(Daemon *app, const char *args) {
 	}
 
 	int i = 0;
-	MSList *mslist = NULL;
-	for (const MSList *node = linphone_core_get_audio_codecs(app->getCore()); node != NULL; node = ms_list_next(node)) {
+	bctbx_list_t *mslist = NULL;
+	for (const bctbx_list_t *node = linphone_core_get_audio_codecs(app->getCore()); node != NULL; node = bctbx_list_next(node)) {
 		PayloadType *payload = reinterpret_cast<PayloadType*>(node->data);
 		if (i == index) {
-			mslist = ms_list_append(mslist, selected_payload);
+			mslist = bctbx_list_append(mslist, selected_payload);
 			++i;
 		}
 		if (selected_payload != payload) {
-			mslist = ms_list_append(mslist, payload);
+			mslist = bctbx_list_append(mslist, payload);
 			++i;
 		}
 	}
 	if (i <= index) {
 		index = i;
-		mslist = ms_list_append(mslist, selected_payload);
+		mslist = bctbx_list_append(mslist, selected_payload);
 	}
 	linphone_core_set_audio_codecs(app->getCore(), mslist);
 
diff --git a/daemon/commands/audio-codec-set.cc b/daemon/commands/audio-codec-set.cc
index 5e9d2935aa07209a04e3154d9c9f025ced733725..2dffe2cd5a1d8007d6f464b1ef7c602456baacc0 100644
--- a/daemon/commands/audio-codec-set.cc
+++ b/daemon/commands/audio-codec-set.cc
@@ -49,7 +49,7 @@ AudioCodecSetCommand::AudioCodecSetCommand() :
 
 static PayloadType *findPayload(LinphoneCore *lc, int payload_type, int *index){
 	if (index) *index=0;
-	for (const MSList *node = linphone_core_get_audio_codecs(lc); node != NULL; node = ms_list_next(node)) {
+	for (const bctbx_list_t *node = linphone_core_get_audio_codecs(lc); node != NULL; node = bctbx_list_next(node)) {
 		PayloadType *payload = reinterpret_cast<PayloadType*>(node->data);
 		if (index) (*index)++;
 		if (payload_type == linphone_core_get_payload_type_number(lc, payload)) {
diff --git a/daemon/commands/audio-codec-toggle.cc b/daemon/commands/audio-codec-toggle.cc
index 4f782abe7e744c105c838183250bb780087f8947..9b7b6beebb403ebac98fe162fd232f7c98b1cb16 100644
--- a/daemon/commands/audio-codec-toggle.cc
+++ b/daemon/commands/audio-codec-toggle.cc
@@ -24,7 +24,7 @@ void AudioCodecToggleCommand::exec(Daemon *app, const char *args) {
 		if (!parser.all()) pt = parser.getPayloadType();
 
 		int index = 0;
-		for (const MSList *node = linphone_core_get_audio_codecs(app->getCore()); node != NULL; node = ms_list_next(node)) {
+		for (const bctbx_list_t *node = linphone_core_get_audio_codecs(app->getCore()); node != NULL; node = bctbx_list_next(node)) {
 			PayloadType *payload = reinterpret_cast<PayloadType*>(node->data);
 			if (parser.all()) {
 				linphone_core_enable_payload_type(app->getCore(), payload, mEnable);
diff --git a/daemon/commands/dtmf.cc b/daemon/commands/dtmf.cc
index d5b0a9103109f29ae11bddec25cdf53dcb1643c0..899ca8c5e1156a95029c5a1ce63e1318fc257a47 100644
--- a/daemon/commands/dtmf.cc
+++ b/daemon/commands/dtmf.cc
@@ -20,10 +20,13 @@ void DtmfCommand::exec(Daemon *app, const char *args) {
 	if (ist.fail()) {
 		app->sendResponse(Response("Missing digit parameter.", Response::Error));
 	} else {
-		digit = digit_str.at(0);
+	digit = digit_str.at(0);
 		if (isdigit(digit) || (digit == 'A') || (digit == 'B') || (digit == 'C') || (digit == 'D') || (digit == '*') || (digit == '#')) {
+			LinphoneCall *call = linphone_core_get_current_call(app->getCore());
 			linphone_core_play_dtmf(app->getCore(), digit, 100);
-			linphone_core_send_dtmf(app->getCore(), digit);
+			if (call == NULL) {
+				linphone_call_send_dtmf(call, digit);
+			}
 			app->sendResponse(Response());
 		} else {
 			app->sendResponse(Response("Incorrect digit parameter.", Response::Error));
diff --git a/daemon/daemon-pipetest.c b/daemon/daemon-pipetest.c
index dde0bb3b05aa8a324743b846e779b2693d05ac9b..a67b8017f9a39a24832d4981b2db2ca3085228e8 100644
--- a/daemon/daemon-pipetest.c
+++ b/daemon/daemon-pipetest.c
@@ -10,15 +10,17 @@
 static int running=1;
 
 int main(int argc, char *argv[]){
+	struct pollfd pfds[2]={{0}};
+	char buf[4096];
+	int fd;
+
 	/* handle args */
 	if (argc < 2) {
 		ortp_error("Usage: %s pipename", argv[0]);
 		return 1;
 	}
 
-	int fd=ortp_client_pipe_connect(argv[1]);
-	struct pollfd pfds[2]={{0}};
-	char buf[4096];
+	fd=ortp_client_pipe_connect(argv[1]);
 
 	ortp_init();
 	ortp_set_log_level_mask(NULL,ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
diff --git a/daemon/daemon.cc b/daemon/daemon.cc
index 3ac3efa305dcb521a4c3f189ea303bd88e2ce043..5007598871f8e4699ebfeb46c967c26b182587ed 100644
--- a/daemon/daemon.cc
+++ b/daemon/daemon.cc
@@ -251,9 +251,9 @@ PayloadTypeParser::PayloadTypeParser(LinphoneCore *core, const string &mime_type
 			return;
 		}
 		mPayloadType = linphone_core_find_payload_type(core, type, rate, channels);
-		if (mPayloadType) mPosition=ms_list_index(linphone_core_get_audio_codecs(core), mPayloadType);
+		if (mPayloadType) mPosition=bctbx_list_index(linphone_core_get_audio_codecs(core), mPayloadType);
 	}else if (number!=-1){
-		const MSList *elem;
+		const bctbx_list_t *elem;
 		for(elem=linphone_core_get_audio_codecs(core);elem!=NULL;elem=elem->next){
 			if (number==linphone_core_get_payload_type_number(core,(PayloadType*)elem->data)){
 				mPayloadType=(PayloadType*)elem->data;
@@ -355,7 +355,7 @@ int Daemon::updateCallId(LinphoneCall *call) {
 }
 
 LinphoneCall *Daemon::findCall(int id) {
-	const MSList *elem = linphone_core_get_calls(mLc);
+	const bctbx_list_t *elem = linphone_core_get_calls(mLc);
 	for (; elem != NULL; elem = elem->next) {
 		LinphoneCall *call = (LinphoneCall *) elem->data;
 		if (linphone_call_get_user_pointer(call) == (void*) (long) id)
@@ -374,7 +374,7 @@ int Daemon::updateProxyId(LinphoneProxyConfig *cfg) {
 }
 
 LinphoneProxyConfig *Daemon::findProxy(int id) {
-	const MSList *elem = linphone_core_get_proxy_config_list(mLc);
+	const bctbx_list_t *elem = linphone_core_get_proxy_config_list(mLc);
 	for (; elem != NULL; elem = elem->next) {
 		LinphoneProxyConfig *proxy = (LinphoneProxyConfig *) elem->data;
 		if (linphone_proxy_config_get_user_data(proxy) == (void*) (long) id)
@@ -384,8 +384,8 @@ LinphoneProxyConfig *Daemon::findProxy(int id) {
 }
 
 LinphoneAuthInfo *Daemon::findAuthInfo(int id)  {
-	const MSList *elem = linphone_core_get_auth_info_list(mLc);
-	if (elem == NULL || id < 1 || (unsigned int)id > ms_list_size(elem)) {
+	const bctbx_list_t *elem = linphone_core_get_auth_info_list(mLc);
+	if (elem == NULL || id < 1 || (unsigned int)id > bctbx_list_size(elem)) {
 		return NULL;
 	}
 	while (id > 1) {
diff --git a/daemon/daemon.h b/daemon/daemon.h
index 564cb7994783fb514f9318d3d52a363df4ad0c98..416877fa1ac8fb25d029f99de5d1662ed1dcb11a 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -5,6 +5,7 @@
 #include <linphonecore_utils.h>
 #include <mediastreamer2/mediastream.h>
 #include <mediastreamer2/mscommon.h>
+#include <bctoolbox/list.h>
 
 #include <string>
 #include <list>
@@ -212,7 +213,7 @@ public:
 	int updateCallId(LinphoneCall *call);
 	int updateProxyId(LinphoneProxyConfig *proxy);
 	inline int maxProxyId() { return mProxyIds; }
-	inline int maxAuthInfoId()  { return ms_list_size(linphone_core_get_auth_info_list(mLc)); }
+	inline int maxAuthInfoId()  { return bctbx_list_size(linphone_core_get_auth_info_list(mLc)); }
 	int updateAudioStreamId(AudioStream *audio_stream);
 	void dumpCommandsHelp();
 	void dumpCommandsHelpHtml();