diff --git a/configure.ac b/configure.ac
index 556941c0e..08bcd8bf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,7 +320,11 @@ if test "$video" = "true"; then
 	
 	if test "$enable_x11" = "true"; then
 	  	AC_CHECK_HEADERS(X11/Xlib.h)
-		AC_CHECK_LIB(X11,XUnmapWindow, X11_LIBS="-lX11")
+		if test "$build_macos" = "yes"; then 
+			X11_LIBS="-L/usr/X11/lib -lX11"
+		else
+			AC_CHECK_LIB(X11,XUnmapWindow, X11_LIBS="-lX11")
+		fi
 		AC_SUBST(X11_LIBS)
 	fi
 	AC_DEFINE(VIDEO_ENABLED,1,[defined if video support is available])
diff --git a/mediastreamer2 b/mediastreamer2
index 0cd097126..d1ea30fb5 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0cd097126ba076cdd1d4fff0b5c33549b75bb28a
+Subproject commit d1ea30fb58954005d1ac3c2a71fbcfcb85d3bf40
diff --git a/oRTP b/oRTP
index a94f569ca..662a65869 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a94f569ca7257c11b0aa09dae10c7f77d0b46e9f
+Subproject commit 662a65869902a927673d9ceff10781e217ca8e9d