diff --git a/m4/Makefile.am b/m4/Makefile.am
index 8fb881339..804180768 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,2 +1,41 @@
-EXTRA_DIST=`ls $(srcdir)/*.m4`
-
+EXTRA_DIST=\
+	codeset.m4 \
+	exosip.m4  \
+	gettext.m4 \
+	glibc2.m4 \
+	glibc21.m4 \
+	iconv.m4 \
+	ilbc.m4 \
+	intdiv0.m4 \
+	intl.m4 \
+	intldir.m4 \
+	intmax.m4 \
+	inttypes-pri.m4 \
+	inttypes.m4 \
+	inttypes_h.m4 \
+	isc-posix.m4 \
+	lcmessage.m4 \
+	lib-ld.m4 \
+	lib-link.m4 \
+	lib-prefix.m4 \
+	lock.m4 \
+	longdouble.m4 \
+	longlong.m4 \
+	nls.m4 \
+	obsolete.m4 \
+	ortp.m4 \
+	osip.m4 \
+	po.m4 \
+	printf-posix.m4 \
+	progtest.m4 \
+	readline.m4 \
+	signed.m4 \
+	size_max.m4 \
+	stdint_h.m4 \
+	uintmax_t.m4 \
+	ulonglong.m4 \
+	video.m4 \
+	visibility.m4 \
+	wchar_t.m4 \
+	wint_t.m4 \
+	xsize.m4
diff --git a/mediastreamer2 b/mediastreamer2
index 4448148a5..4f4ebb3a7 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 4448148a56924506ddecbeffb75251845251c750
+Subproject commit 4f4ebb3a7ad5755925f9612e95f7e34b677cf664
diff --git a/oRTP b/oRTP
index 1b449a349..36ebc75f7 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 1b449a3491fb2397df129467bf58a64921d65e40
+Subproject commit 36ebc75f7dfef4f4a2b63df61a040211e7c7f6c8