diff --git a/srcpkgs/libmatroska/template b/srcpkgs/libmatroska/template
index c560c03ba1..b202fc95e7 100644
--- a/srcpkgs/libmatroska/template
+++ b/srcpkgs/libmatroska/template
@@ -1,9 +1,7 @@
 # Template file for 'libmatroska'
 pkgname=libmatroska
 version=1.3.0
-revision=3
-build_style=gnu-makefile
-build_wrksrc="make/linux"
+revision=4
 makedepends="libebml-devel"
 short_desc="Extensible open standard Audio/Video container format"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -11,39 +9,29 @@ homepage="http://dl.matroska.org/downloads/libmatroska/"
 license="LGPL-2.1"
 distfiles="http://www.bunkus.org/videotools/mkvtoolnix/sources/$pkgname-$version.tar.bz2"
 checksum=5231ec958571365e719a6fd3c220227af6cf0f14e0bd1bcf766ddbc068d18e69
-long_desc="
- Matroska aims to become THE Standard of Multimedia Container Formats.
- It was derived from a project called MCF, but differentiates from it
- significantly. It is based on EBML (Extensible Binary Meta Language),
- a binary derivative of XML.
 
- Matroska is designed with the future in mind. It incorporates features
- you would expect from a modern container format, like:
-
-  - Streamable over internet (HTTP and RTP)
-  - Fast seeking in the file
-  - High error recovery
-  - Menus (like DVDs have)
-  - Chapter entries
-  - Selectable subtitle streams
-  - Selectable audio streams
-  - Modularly extendable"
+do_build() {
+	cd make/linux
+	make CC="$CC" CXX="$CXX" LD="$LD" CFLAGS="$CFLAGS" ${makejobs}
+}
 
 do_install() {
+	cd make/linux
 	make prefix=${DESTDIR}/usr install
 }
 
 libmatroska-devel_package() {
-	depends="libebml-devel libmatroska>=${version}"
-	short_desc+=" -- development files"
+	depends="libebml-devel libmatroska>=${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }
 
 libmatroska_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }