diff --git a/configure.ac b/configure.ac
index 8f31de3d2..a8e23f911 100644
--- a/configure.ac
+++ b/configure.ac
@@ -680,7 +680,7 @@ AC_ARG_ENABLE(lime,
 		no)	lime=false ;;
 		*)	AC_MSG_ERROR(bad value ${enableval} for --enable-lime) ;;
 	esac],
-	[lime=auto]
+	[lime=false]
 )
 
 if test "$lime" != "false" ; then
diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 25e579495..d3ee638ce 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -433,7 +433,10 @@ static void call_ringing(SalOp *h){
 	}else{
 		/*accept early media */
 		if ((call->audiostream && audio_stream_started(call->audiostream))
-			|| (call->videostream && video_stream_started(call->videostream))) {
+#ifdef VIDEO_ENABLED
+			|| (call->videostream && video_stream_started(call->videostream))
+#endif
+			) {
 			/*streams already started */
 			try_early_media_forking(call,md);
 			#ifdef VIDEO_ENABLED
diff --git a/mediastreamer2 b/mediastreamer2
index e45c262db..a5c3829d2 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit e45c262db9413d4f84f8a5b623baf19483667f42
+Subproject commit a5c3829d290c35c5a7a760019b1b9ad05b1a257c