diff --git a/console/Makefile.am b/console/Makefile.am
index e844d9886..84e0c94cd 100644
--- a/console/Makefile.am
+++ b/console/Makefile.am
@@ -3,20 +3,17 @@
 AM_CPPFLAGS=\
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/coreapi \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/exosip
+	-I$(top_srcdir)/include 
 
 COMMON_CFLAGS=\
 	-DIN_LINPHONE \
-	-DENABLE_TRACE \
 	-D_ORTP_SOURCE \
 	$(STRICT_OPTIONS) \
+	$(ORTP_CFLAGS) \
+	$(MEDIASTREAMER_CFLAGS) \
 	$(VIDEO_CFLAGS) \
 	$(READLINE_CFLAGS) \
-	$(OSIP_CFLAGS) \
-	$(ORTP_CFLAGS) \
-	$(SQLITE3_CFLAGS) \
-	$(MEDIASTREAMER_CFLAGS)
+	$(SQLITE3_CFLAGS) 
 
 if BUILD_CONSOLE
 
diff --git a/mediastreamer2 b/mediastreamer2
index 5003385d5..8097db23c 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 5003385d52f715b60772da879b4655463890ffd1
+Subproject commit 8097db23c50a476593cf912f0c554ca4e391c7e3