diff --git a/common/shlibs b/common/shlibs
index d06b7e1b4d..54706d0c6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2021,3 +2021,5 @@ libjreen-qt5.so.1 jreen-qt5-1.2.0_1
 libtomahawk.so.0.8.4 tomahawk-qt5-0.8.4_3
 libtomahawk-playdarapi.so.0.8.4 tomahawk-qt5-0.8.4_3
 libtomahawk-widgets.so.0.8.4 tomahawk-qt5-0.8.4_3
+libzen.so.0 libzen-0.4.31_1
+libmediainfo.so.0 libmediainfo-0.7.73_1
diff --git a/srcpkgs/libmediainfo-devel b/srcpkgs/libmediainfo-devel
new file mode 120000
index 0000000000..815886eb38
--- /dev/null
+++ b/srcpkgs/libmediainfo-devel
@@ -0,0 +1 @@
+libmediainfo
\ No newline at end of file
diff --git a/srcpkgs/libmediainfo/template b/srcpkgs/libmediainfo/template
new file mode 100644
index 0000000000..2869794490
--- /dev/null
+++ b/srcpkgs/libmediainfo/template
@@ -0,0 +1,46 @@
+# Template file for 'libmediainfo'
+
+pkgname=libmediainfo
+version=0.7.73
+revision=1
+short_desc="Shared library for mediainfo"
+homepage="http://mediaarea.net/MediaInfo"
+maintainer="Georg Schabel <gescha@posteo.de>"
+license="BSD"
+
+distfiles="${SOURCEFORGE_SITE}/mediainfo/${pkgname}_${version}.tar.gz"
+checksum=40fe04c2f959537aef6769c89d1b7a1dca242810937f59352e84bc8d1ac3b7a9
+
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config"
+makedepends="libmms-devel libcurl-devel libzen-devel"
+configure_args="--enable-shared --disable-static
+ --with-libcurl --with-libmms"
+create_wrksrc=yes
+build_wrksrc="MediaInfoLib/Project/GNU/Library"
+
+pre_configure() {
+	autoreconf -fi
+}
+
+do_install() {
+	make DESTDIR=${DESTDIR} install
+	for i in MediaInfo MediaInfoDLL; do
+		install -dm 755 ${DESTDIR}/usr/include/$i
+		install -m 644 ${wrksrc}/MediaInfoLib/Source/$i/*.h ${DESTDIR}/usr/include/$i
+	done
+	install -dm 755 ${DESTDIR}/usr/lib/pkgconfig
+	install -m 644 libmediainfo.pc ${DESTDIR}/usr/lib/pkgconfig
+	sed -i -e 's|Version: |Version: '$version'|g' ${DESTDIR}/usr/lib/pkgconfig/libmediainfo.pc
+	vlicense ${wrksrc}/MediaInfoLib/License.html
+}
+
+libmediainfo-devel_package() {
+	depends="${makedepends} libmediainfo>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/*.so
+	}
+}
diff --git a/srcpkgs/libzen-devel b/srcpkgs/libzen-devel
new file mode 120000
index 0000000000..0060eb2a98
--- /dev/null
+++ b/srcpkgs/libzen-devel
@@ -0,0 +1 @@
+libzen
\ No newline at end of file
diff --git a/srcpkgs/libzen/template b/srcpkgs/libzen/template
new file mode 100644
index 0000000000..93ba9cf6ec
--- /dev/null
+++ b/srcpkgs/libzen/template
@@ -0,0 +1,51 @@
+# Template build file for 'libzen'.
+
+pkgname=libzen
+version=0.4.31
+revision=1
+short_desc="Shared library for libmediainfo and mediainfo"
+homepage="http://mediaarea.net/MediaInfo"
+maintainer="Georg Schabel <gescha@posteo.de>"
+license="zlib"
+
+distfiles="${SOURCEFORGE_SITE}/zenlib/${pkgname}_${version}.tar.gz"
+checksum=98ddd5c8e02d672055b0087067bc9bcdff27d5f9a8b8943fc209c53d2cf4caa7
+
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config"
+configure_args="--enable-shared"
+create_wrksrc=yes
+build_wrksrc="ZenLib/Project/GNU/Library"
+
+pre_configure() {
+	autoreconf -fi
+}
+
+do_install() {
+	make DESTDIR=${DESTDIR} install
+	install -dm 755 ${DESTDIR}/usr/include/ZenLib
+	install -m 644 ${wrksrc}/ZenLib/Source/ZenLib/*.h \
+		${DESTDIR}/usr/include/ZenLib
+	for i in HTTP_Client Format/Html Format/Http; do
+		install -dm0755 ${DESTDIR}/usr/include/ZenLib/$i
+		install -m0644 ${wrksrc}/ZenLib/Source/ZenLib/$i/*.h \
+			${DESTDIR}/usr/include/ZenLib/$i
+	done
+	install -dm 755 ${DESTDIR}/usr/lib/pkgconfig
+	install -m 644 libzen.pc ${DESTDIR}/usr/lib/pkgconfig
+	sed -i -e 's|Version: |Version: '$version'|g' \
+		${DESTDIR}/usr/lib/pkgconfig/libzen.pc
+	vlicense ${wrksrc}/ZenLib/License.txt
+}
+
+libzen-devel_package() {
+	depends="libzen>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/bin/libzen-config
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+	}
+}
diff --git a/srcpkgs/mediainfo-gui b/srcpkgs/mediainfo-gui
new file mode 120000
index 0000000000..76951070b8
--- /dev/null
+++ b/srcpkgs/mediainfo-gui
@@ -0,0 +1 @@
+mediainfo
\ No newline at end of file
diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template
new file mode 100644
index 0000000000..d65bf8b806
--- /dev/null
+++ b/srcpkgs/mediainfo/template
@@ -0,0 +1,45 @@
+# Template file for 'mediainfo'
+
+pkgname=mediainfo
+version=0.7.73
+revision=1
+short_desc="Display technical and tag data for video and audio files"
+homepage="http://mediaarea.net/MediaInfo"
+maintainer="Georg Schabel <gescha@posteo.de>"
+license="BSD"
+
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}.tar.gz"
+checksum=1fde5b2972d923f7f87c2b2e738e8a086603243770961b077cf558f9836e612e
+
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config"
+makedepends="libmediainfo-devel zlib-devel
+ wxGTK-devel wxWidgets-devel"
+create_wrksrc=yes
+build_wrksrc="MediaInfo/Project/GNU/CLI"
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
+	vlicense ${wrksrc}/MediaInfo/License.html
+}
+
+mediainfo-gui_package() {
+	short_desc+=" - GUI version"
+	depends="mediainfo>=${version}_${revision} desktop-file-utils hicolor-icon-theme"
+	pkg_install(){
+		cd ${wrksrc}/MediaInfo/Project/GNU/GUI
+		autoreconf -fi
+		./configure --prefix=/usr
+		make DESTDIR="${DESTDIR}" install
+
+		vmkdir usr/share/icons/hicolor/scalable/apps
+		vinstall ${wrksrc}/MediaInfo/Source/Resource/Image/MediaInfo.svg 644 \
+			usr/share/icons/hicolor/scalable/apps mediainfo.svg
+		vinstall ${wrksrc}/MediaInfo/Source/Resource/Image/MediaInfo.png 644 \
+			usr/share/pixmaps mediainfo-gui.png
+		vinstall mediainfo-gui.desktop 644 usr/share/applications
+	}
+}