diff --git a/configure.ac b/configure.ac
index c5db9df8b..023236f83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -430,6 +430,8 @@ if test "$build_wizard" != "false" ; then
 	[
 		if test "$build_wizard" = "true" ; then
 			AC_MSG_ERROR([Could not found libsoup, assistant cannot be compiled.])
+		else
+			build_wizard=false
 		fi
 	])
 fi
@@ -611,12 +613,15 @@ linphone.iss
 AC_OUTPUT
 
 echo "Linphone build configuration ended."
+echo "Summary of build options:"
+printf "* Video support\t\t\t%s\n" $video
+printf "* GTK interface\t\t\t%s\n" $gtk_ui
+printf "* Account assistant\t\t%s\n" $build_wizard
+printf "* Console interface\t\t%s\n" $console_ui
+printf "* zRTP encryption (GPLv3)\t%s\n" $zrtp
 
-if test x$gtk_ui = xtrue ; then
-	echo "* GTK interface will be compiled."
-fi
-if test x$console_ui = xtrue ; then
-	echo "* Console interface will be compiled."
+if test "$enable_tunnel" = "true" ; then
+	printf "* Tunnel support\t\ttrue\n"
 fi
 
 echo "Now type 'make' to compile, and then 'make install' as root to install it."
diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index c93ce5adc..86c05c5e6 100644
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -2003,9 +2003,18 @@ int sal_iterate(Sal *sal){
 		if (process_event(sal,ev))
 			eXosip_event_free(ev);
 	}
+#ifdef HAVE_EXOSIP_TRYLOCK
+	if (eXosip_trylock()==0){
+		eXosip_automatic_refresh();
+		eXosip_unlock();
+	}else{
+		ms_warning("eXosip_trylock busy.");
+	}
+#else
 	eXosip_lock();
 	eXosip_automatic_refresh();
 	eXosip_unlock();
+#endif
 	return 0;
 }
 
diff --git a/m4/exosip.m4 b/m4/exosip.m4
index 9be357f71..51419d48a 100644
--- a/m4/exosip.m4
+++ b/m4/exosip.m4
@@ -46,9 +46,9 @@ AC_CHECK_LIB([eXosip2],[eXosip_tls_verify_certificate],
 	[AC_DEFINE([HAVE_EXOSIP_TLS_VERIFY_CERTIFICATE],[1],[Defined when eXosip_tls_verify_certificate is available])],
 	[AC_MSG_WARN([Could not find eXosip_tls_verify_certificate in eXosip2 !])],
 	[-losipparser2 -losip2 ])
-AC_CHECK_LIB([eXosip2],[eXosip_get_socket],
-	[AC_DEFINE([HAVE_EXOSIP_GET_SOCKET],[1],[Defined when eXosip_get_socket is available])],
-	[AC_MSG_WARN([Could not find eXosip_get_socket in eXosip2 !])],
+AC_CHECK_LIB([eXosip2],[eXosip_trylock],
+	[AC_DEFINE([HAVE_EXOSIP_TRYLOCK],[1],[Defined when eXosip_get_socket is available])],
+	[],
 	[-losipparser2 -losip2 ])
 dnl AC_CHECK_LIB([eXosip2],[eXosip_get_naptr],
 dnl	[AC_DEFINE([HAVE_EXOSIP_NAPTR_SUPPORT],[1],[Defined when eXosip_get_naptr is available])],
diff --git a/oRTP b/oRTP
index cbd275033..97acf505e 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit cbd2750330bc86c96f56fa68d2ebc753105b4149
+Subproject commit 97acf505e76962fe8efa586335fd5c042c2b44fe