diff --git a/configure.ac b/configure.ac
index 07562cc7b..af33b7c8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -609,6 +609,7 @@ AC_ARG_ENABLE(alsa,
 	[alsa=true]
 )
 
+dnl this options are just for passing to mediastreamer2 subproject
 AC_ARG_ENABLE(zrtp,
 	[AS_HELP_STRING([--enable-zrtp], [Turn on zrtp support])],
 	[case "${enableval}" in
@@ -619,6 +620,7 @@ AC_ARG_ENABLE(zrtp,
 	[zrtp=false]
 )
 
+dnl this options are just for passing to mediastreamer2 subproject
 AC_ARG_ENABLE(dtls,
 	[AS_HELP_STRING([--enable-dtls], [Turn on dtls support - requires polarssl > 1.4])],
 	[case "${enableval}" in
@@ -672,23 +674,25 @@ fi
 
 dnl check for Lime support, need polarssl version >= 1.3 (with gcm.h)
 AC_ARG_ENABLE(lime,
-	[AS_HELP_STRING([--enable-lime], [Turn on or off compilation of Instant Messaging Encryption (default=yes)])],
+	[AS_HELP_STRING([--enable-lime], [Turn on or off compilation of Instant Messaging Encryption (default=auto)])],
 	[case "${enableval}" in
 		yes)	lime=true ;;
 		no)	lime=false ;;
 		*)	AC_MSG_ERROR(bad value ${enableval} for --enable-lime) ;;
 	esac],
-	[lime=true]
+	[lime=auto]
 )
 
-if test "$lime" = "true" ; then
+if test "$lime" != "false" ; then
 	if test "x$found_polarssl" != "xyes" ; then
-		AC_MSG_ERROR("LIME requires POLARSSL in version >= 1.3")
+		if test "$lime" = "true" ; then
+			AC_MSG_ERROR("LIME requires POLARSSL in version >= 1.3")
+		fi
+		lime=false
 	else
 		AC_DEFINE(HAVE_LIME, 1, [Defined when LIME support is compiled])
+		lime=true
 	fi
-else
-	echo "LIME compilation is disabled."
 fi
 
 dnl build console if required
@@ -700,8 +704,6 @@ AM_CONDITIONAL(ARMBUILD, test x$use_arm_toolchain = xyes)
 dnl compilation of gtk user interface
 AM_CONDITIONAL(BUILD_GTK_UI, [test x$gtk_ui = xtrue ] )
 AM_CONDITIONAL(BUILD_WIN32, test x$mingw_found = xyes )
-AM_CONDITIONAL(BUILD_ZRTP, test x$zrtp = xtrue)
-AM_CONDITIONAL(BUILD_DTLS, test x$dtls = xtrue)
 
 dnl check getenv
 AH_TEMPLATE([HAVE_GETENV])
@@ -1051,8 +1053,6 @@ printf "* %-30s %s\n" "Account assistant"	$build_wizard
 printf "* %-30s %s\n" "Console interface"	$console_ui
 printf "* %-30s %s\n" "Tools"			$build_tools
 printf "* %-30s %s\n" "Message storage"		$enable_msg_storage
-printf "* %-30s %s\n" "zRTP encryption"		$zrtp
-printf "* %-30s %s\n" "DTLS encryption"		$dtls
 printf "* %-30s %s\n" "IM encryption"		$lime
 printf "* %-30s %s\n" "uPnP support" 		$build_upnp
 printf "* %-30s %s\n" "LDAP support" 		$enable_ldap
diff --git a/mediastreamer2 b/mediastreamer2
index 65d6ad29e..d31227221 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 65d6ad29eaa2bb13aa336d027414cb92c7703c48
+Subproject commit d31227221aaf0e1a22af14875563e633396a9086
diff --git a/oRTP b/oRTP
index 19ed314d5..8eac942e4 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 19ed314d52d4061a21daa4805aef9459ad31640c
+Subproject commit 8eac942e4288e5884267864fc46e641aa5a3c74e