diff --git a/m4/exosip.m4 b/m4/exosip.m4
index 2c21b129d..8e469969c 100644
--- a/m4/exosip.m4
+++ b/m4/exosip.m4
@@ -4,9 +4,18 @@ AC_REQUIRE([AC_CANONICAL_HOST])
 AC_REQUIRE([LP_CHECK_OSIP2])
 
 
-case $target_os in
-	*darwin*)
-		OSIP_LIBS="$OSIP_LIBS  -framework CoreFoundation "
+case $host_alias in
+	i386-apple*)
+		OSIP_LIBS="$OSIP_LIBS  -framework CoreFoundation -framework CFNetwork"
+	;;
+	armv6-apple*)
+		OSIP_LIBS="$OSIP_LIBS  -framework CoreFoundation -framework CFNetwork"
+	;;
+	armv7-apple*)
+		OSIP_LIBS="$OSIP_LIBS  -framework CoreFoundation -framework CFNetwork"
+	;;
+	x86_64-apple*)
+		OSIP_LIBS="$OSIP_LIBS  -framework CoreFoundation"
 	;;
 esac
 
diff --git a/mediastreamer2 b/mediastreamer2
index 3e62df330..4e245d3a0 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 3e62df330823c9efefaf314e894a6a7867f9ff76
+Subproject commit 4e245d3a00c55cc7120644adf5d97372224d2816