diff --git a/common/shlibs b/common/shlibs
index 755b4648a80..ab2810c5aab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3391,3 +3391,5 @@ libshp.so.1 shapelib-1.4.1_1
 libantlr3c.so libantlr3c-3.4_1
 libbzrtp.so.0 bzrtp-1.0.6_1
 libbellesip.so.0 belle-sip-1.5.0_1
+libmediastreamer_base.so.10 mediastreamer-2.16.1_1
+libmediastreamer_voip.so.10 mediastreamer-2.16.1_1
diff --git a/srcpkgs/mediastreamer-devel b/srcpkgs/mediastreamer-devel
new file mode 120000
index 00000000000..8b1380ac78c
--- /dev/null
+++ b/srcpkgs/mediastreamer-devel
@@ -0,0 +1 @@
+mediastreamer
\ No newline at end of file
diff --git a/srcpkgs/mediastreamer/patches/MS2_GIT_VERSION.patch b/srcpkgs/mediastreamer/patches/MS2_GIT_VERSION.patch
new file mode 100644
index 00000000000..447763b7052
--- /dev/null
+++ b/srcpkgs/mediastreamer/patches/MS2_GIT_VERSION.patch
@@ -0,0 +1,12 @@
+--- ms.c	2017-08-23 16:55:57.967109716 +0200
++++ src/base/msfactory.c	2017-08-23 16:56:36.391111180 +0200
+@@ -28,6 +28,9 @@
+ #	define MS2_GIT_VERSION "unknown"
+ #	endif
+ #endif
++#ifndef MS2_GIT_VERSION
++#	define MS2_GIT_VERSION "unknown"
++#endif
+ 
+ #include "mediastreamer2/msfilter.h"
+ #include "mediastreamer2/mseventqueue.h"
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
new file mode 100644
index 00000000000..33a15de17aa
--- /dev/null
+++ b/srcpkgs/mediastreamer/template
@@ -0,0 +1,28 @@
+# Template file for 'mediastreamer'
+pkgname=mediastreamer
+version=2.16.1
+revision=1
+build_style="cmake"
+configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
+hostmakedepends="python"
+makedepends="bzrtp-devel ffmpeg-devel glew-devel libXv-devel libsrtp-devel
+ libupnp-devel libvpx-devel mbedtls-devel opus-devel ortp-devel pulseaudio-devel
+ speex-devel v4l-utils-devel"
+short_desc="Powerful and lightweight streaming engine for voice/video telephony"
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later"
+homepage="https://www.linphone.org/technical-corner/mediastreamer2/overview"
+distfiles="https://www.linphone.org/releases/sources/mediastreamer/mediastreamer-${version}.tar.gz"
+checksum=33351f9409e229a00aaf831930916e1934d8e972773e95f7b7177c9e4cc61772
+
+mediastreamer-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/Mediastreamer2/cmake
+	}
+}