diff --git a/media-libs/libmkv/libmkv-0.6.5.1.recipe b/media-libs/libmkv/libmkv-0.6.5.1.recipe
index 4734cdedf..7f669ea73 100644
--- a/media-libs/libmkv/libmkv-0.6.5.1.recipe
+++ b/media-libs/libmkv/libmkv-0.6.5.1.recipe
@@ -5,21 +5,21 @@ A lightweight Matroska muxer written for HandBrake.
 HOMEPAGE="https://github.com/saintdev/libmkv"
 COPYRIGHT="Copyright (C) 2007 libmkv"
 LICENSE="GNU GPL v2"
-SRC_URI="https://github.com/saintdev/libmkv/archive/0.6.5.1.tar.gz"
+SRC_URI="https://github.com/saintdev/libmkv/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="41f08a08bab354f9834fda1dcdd1dcf4a0c67ad18021eb980f808654464cef00"
-SRC_FILENAME="libmkv-0.6.5.1.tar.gz"
-REVISION="1"
+SRC_FILENAME="libmkv-$portVersion.tar.gz"
+REVISION="2"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	libmkv${secondaryArchSuffix} = $portVersion
-	lib:libmkv
+	libmkv$secondaryArchSuffix = $portVersion
+	lib:libmkv$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 
 BUILD_REQUIRES="
@@ -27,16 +27,14 @@ BUILD_REQUIRES="
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf
 	"
 
-SOURCE_DIR="libmkv-${portVersion}"
-
 BUILD()
 {
 	./bootstrap.sh
@@ -60,8 +58,8 @@ INSTALL()
 
 PROVIDES_devel="
 	libmkv${secondaryArchSuffix}_devel = $portVersion
-	devel:libmkv${secondaryArchSuffix} = $portVersion
+	devel:libmkv$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
 REQUIRES_devel="
-	libmkv${secondaryArchSuffix} == $portVersion base
+	libmkv$secondaryArchSuffix == $portVersion base
 	"