diff --git a/configure.ac b/configure.ac
index 9800c19f4..544691ff0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1019,12 +1019,12 @@ dnl ##################################################
 dnl # Check for doxygen
 dnl ##################################################
 
-AC_ARG_ENABLE(doxygen,
-	[AS_HELP_STRING([--disable-documentation], [Disable documentation generation using doxygen (default=no)])],
+AC_ARG_ENABLE(documentation,
+	[AS_HELP_STRING([--enable-documentation], [Documentation generation using doxygen (default=yes)])],
 	[case "${enableval}" in
 		yes)	documentation_enabled=yes;;
 		no)		documentation_enabled=no;;
-		*)		AC_MSG_ERROR("Bad value for --disable-documentation");;
+		*)		AC_MSG_ERROR("Bad value for --enable-documentation");;
 	esac],
 	[documentation_enabled=yes]
 )
@@ -1076,12 +1076,13 @@ printf "* %-30s %s\n" "Video support"		$video
 printf "* %-30s %s\n" "GTK interface"		$gtk_ui
 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" "Tools"				$build_tools
 printf "* %-30s %s\n" "Message storage"		$enable_msg_storage
 printf "* %-30s %s\n" "IM encryption"		$lime
 printf "* %-30s %s\n" "uPnP support" 		$build_upnp
 printf "* %-30s %s\n" "LDAP support" 		$enable_ldap
 printf "* %-30s %s\n" "ZLIB support" 		$found_zlib
+printf "* %-30s %s\n" "Documentation" 		$documentation_enabled
 
 if test "$enable_tunnel" = "true" ; then
 	printf "* %-30s %s\n" "Tunnel support" "true"
diff --git a/mediastreamer2 b/mediastreamer2
index 7319e26be..f1ebe4ca4 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7319e26be1e73aec67e3e6b0e73bfc486cde2f30
+Subproject commit f1ebe4ca4709f02a3702c4f1929a953931757cc5
diff --git a/oRTP b/oRTP
index 15476b915..6ac50c131 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 15476b915d35e91f3bad92b5e7d1bc4073c50603
+Subproject commit 6ac50c1315aecb4a419b220af51e6361e7ee7813