diff --git a/configure.ac b/configure.ac
index ae2d59386..4957eeb58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,7 +183,12 @@ AC_ARG_ENABLE(upnp,
 )
 
 if test "$build_upnp" != "false" ; then
-	PKG_CHECK_MODULES([LIBUPNP], [libupnp], [build_upnp=true],
+	PKG_CHECK_MODULES([LIBUPNP], [libupnp], 
+		[if  pkg-config --atleast-version=1.6 "libupnp < 1.7"; then
+			build_upnp=true
+		else
+			AC_MSG_ERROR([libupnp >= 1.6 < 1.5 required.])
+		fi],
 		[if test "$build_upnp" == "true" ; then
 			AC_MSG_ERROR([libupnp not found.])
 		else
diff --git a/mediastreamer2 b/mediastreamer2
index d1d3e1af5..f223705f2 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit d1d3e1af51ab26ecb9808d6f83629e661c67af5f
+Subproject commit f223705f2853e62f0fb5340b994cd40665b9e854