diff --git a/NEWS b/NEWS
index a684b44afedbfd88efdaf880969379e10ff1d394..687b27f980fa4e771d0622b96cc19bc76ce42d41 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+linphone-3.4.2 -- March 3rd, 2011
+	* fix problems with webcams on windows
+	Requires mediastreamer-2.7.2
+
 linphone-3.4.1 -- February 17th, 2011
 	* bugfixes
 	* gtk executable is renamed "linphone" (was linphone-3 before)
diff --git a/configure.ac b/configure.ac
index 0615cc48f2f47898bc00ff96f3c892aedd674d53..c4198463dbad3a5a14eef92d232b7bc938ee6e1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.4.1],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.4.2],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
 
@@ -253,6 +253,18 @@ AC_CHECK_FUNCS(getifaddrs)
 dnl check for osip2
 LP_CHECK_OSIP2
 
+dnl conditionnal build for ssl
+AC_ARG_ENABLE(ssl,
+		[  --enable-ssl    Turn on ssl support compiling. Required for sip tls. default = false],
+		[case "${enableval}" in
+		yes) build_ssl=true ;;
+		no)  build_ssl=false ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-ssl) ;;
+		esac],[build_ssl=false])
+
+if test "$build_ssl" = "true"; then
+	PKG_CHECK_MODULES(OPENSSL, libssl >= 0.9.8)
+fi
 dnl setup flags for exosip library
 LP_SETUP_EXOSIP
 
@@ -272,7 +284,6 @@ dnl Furthermore it is good to repeat here all mediastreamer2 toggles
 dnl since top-level configure --help will not print them.
 
 PKG_CHECK_MODULES(SPEEX, speex >= 1.1.6, build_speex=yes)
-AC_SUBST(SPEEX_LIBS)
 
 dnl conditionnal build of video support
 AC_ARG_ENABLE(video,
diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 8f88045f568a2c3993ffa01b6b705e5f03c1d3b8..a362dda837bf66a2b4ab28a46222cd5b9462ed14 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -44,7 +44,7 @@ liblinphone_la_LDFLAGS= -version-info $(LIBLINPHONE_SO_VERSION) -no-undefined
 liblinphone_la_LIBADD= \
 		$(EXOSIP_LIBS) \
 		$(MEDIASTREAMER_LIBS) \
-		$(ORTP_LIBS)
+		$(ORTP_LIBS) $(OPENSSL_LIBS)
 
 if BUILD_WIN32
 liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la
@@ -54,15 +54,11 @@ noinst_PROGRAMS=test_lsd test_ecc
 
 test_lsd_SOURCES=test_lsd.c
 
-test_lsd_LDADD=liblinphone.la \
-							$(MEDIASTREAMER_LIBS) \
-							$(ORTP_LIBS)
+test_lsd_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
 
 test_ecc_SOURCES=test_ecc.c
 
-test_ecc_LDADD=liblinphone.la \
-							$(MEDIASTREAMER_LIBS) \
-							$(ORTP_LIBS)
+test_ecc_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
 
 
 
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 6815a833d3589a297240bda46f2a0ec8d8c0e314..062e345b05c092b7ff877c809ab3fb971f663a21 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -496,10 +496,6 @@ static void sip_config_read(LinphoneCore *lc)
 	ipv6=lp_config_get_int(lc->config,"sip","use_ipv6",-1);
 	if (ipv6==-1){
 		ipv6=0;
-		if (host_has_ipv6_network()){
-			if (lc->vtable.display_message)
-				lc->vtable.display_message(lc,_("Your machine appears to be connected to an IPv6 network. By default linphone always uses IPv4. Please update your configuration if you want to use IPv6"));
-		}
 	}
 	linphone_core_enable_ipv6(lc,ipv6);
 	memset(&tr,0,sizeof(tr));
diff --git a/coreapi/misc.c b/coreapi/misc.c
index 059c6228ca5d25ea56cfebb0bebbdd8bbdb10b42..799de3aeeac78469301677a84f9e25a7d4543db7 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -345,52 +345,6 @@ bool_t lp_spawn_command_line_sync(const char *command, char **result,int *comman
 	return FALSE;
 }
 
-#if defined(HAVE_GETIFADDRS) && defined(INET6)
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <ifaddrs.h>
-bool_t host_has_ipv6_network()
-{
-	struct ifaddrs *ifp;
-	struct ifaddrs *ifpstart;
-	bool_t ipv6_present=FALSE;
-
-	if (getifaddrs (&ifpstart) < 0)
-	{
-		return FALSE;
-	}
-
-	for (ifp=ifpstart; ifp != NULL; ifp = ifp->ifa_next)
-	{
-		if (!ifp->ifa_addr)
-		  continue;
-
-		switch (ifp->ifa_addr->sa_family) {
-		case AF_INET:
-
-			break;
-		case AF_INET6:
-		    ipv6_present=TRUE;
-			break;
-		default:
-		        continue;
-  		}
-	}
-
-	freeifaddrs (ifpstart);
-
-	return ipv6_present;
-}
-#else
-
-bool_t host_has_ipv6_network()
-{
-	return FALSE;
-}
-
-
-#endif
-
 static ortp_socket_t create_socket(int local_port){
 	struct sockaddr_in laddr;
 	ortp_socket_t sock;
diff --git a/linphone-deps.filelist b/linphone-deps.filelist
index 19ea6ecdee377bdb44bd3e2899819bd20eb3e856..22e069ed85b2a312647474f8136dbc3401081f1d 100755
--- a/linphone-deps.filelist
+++ b/linphone-deps.filelist
@@ -1,8 +1,8 @@
 ./bin/avcodec-52.dll
 ./bin/avutil-50.dll
 ./bin/libeXosip2-6.dll
-./bin/libogg.dll
-./bin/libtheora.dll
+./bin/libogg-0.dll
+./bin/libtheora-0.dll
 ./bin/libxml2-2.dll
 ./bin/libosip2-6.dll
 ./bin/libosipparser2-6.dll
diff --git a/m4/exosip.m4 b/m4/exosip.m4
index c25d8ad96347dc09e93bcb1a910b53961c01fe37..cf1db587db3bca1925573a83a288cd39affaf353 100644
--- a/m4/exosip.m4
+++ b/m4/exosip.m4
@@ -23,7 +23,7 @@ CPPFLAGS=$CPPFLAGS_save
 
 dnl check for eXosip2 libs
 LDFLAGS_save=$LDFLAGS
-LDFLAGS="$OSIP_LIBS $LDFLAGS"
+LDFLAGS="$OSIP_LIBS $LDFLAGS $OPENSSL_LIBS"
 LIBS_save=$LIBS
 AC_CHECK_LIB([eXosip2],[eXosip_subscribe_remove],
 	[],
diff --git a/mediastreamer2 b/mediastreamer2
index 9412db625a9f00e6de4c612dbc69ab1f98822d63..fee15bc174996771973a27bf974d740e7f657bf6 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 9412db625a9f00e6de4c612dbc69ab1f98822d63
+Subproject commit fee15bc174996771973a27bf974d740e7f657bf6