diff --git a/configure.ac b/configure.ac
index de230aba1..ad0897838 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,13 +246,13 @@ fi
 AC_SUBST(IPV6_CFLAGS)
 
 dnl enable timestamp support
-AC_ARG_ENABLE(rtp-timestamp,
-      [  --enable-rtp-timestamp Turn on RTP packet timestamp],
+AC_ARG_ENABLE(ntp-timestamp,
+      [  --enable-ntp-timestamp Turn on NTP timestamping on received packet],
       [case "${enableval}" in
-        yes)  rtptimestamp=true;;
-        no)   rtptimestamp=false;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-rtp-timestamp) ;;
-      esac],[rtptimestamp=false])
+        yes)  ntptimestamp=true;;
+        no)   ntptimestamp=false;;
+        *) AC_MSG_ERROR(bad value ${enableval} for --enable-ntp-timestamp) ;;
+      esac],[ntptimestamp=false])
 
 AC_ARG_ENABLE(debug,
                         [  --enable-debug=[yes/no]   enables the display of traces showing the execution of the library. [default=yes]],
diff --git a/mediastreamer2 b/mediastreamer2
index eae923bd8..20b28098f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit eae923bd8fd87476f0dddcde6d54824147d031fb
+Subproject commit 20b28098fa2b95fd2489fdbd73202e2b4807d4ab
diff --git a/oRTP b/oRTP
index ff0da4b42..2a36f8669 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit ff0da4b42661d9996753372cb35dc0f25f5ff6ec
+Subproject commit 2a36f8669ea5a9499017711c53a311bea69e0ee3
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d1c11e80e..49808b8ef 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -12,6 +12,7 @@ mediastreamer2/src/extdisplay.c
 mediastreamer2/src/gsm.c
 mediastreamer2/src/ice.c
 mediastreamer2/src/itc.c
+mediastreamer2/src/genericplc.c
 mediastreamer2/src/macsnd.c
 mediastreamer2/src/msandroid.cpp
 mediastreamer2/src/msandroidvideo.cpp