diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
index acd52cd0d..aec0ad3d9 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
+++ b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
@@ -1,27 +1,79 @@
-DESCRIPTION="libdvdnav" 
-HOMEPAGE="http://www.mplayerhq.hu/design7/news.html" 
+SUMMARY="Easy use of sophisticated DVD navigation features."
+DESCRIPTION="libdvdnav allows easy use of sophisticated DVD navigation features such as DVD menus,
+	multiangle playback and even interactive DVD games."
+HOMEPAGE="http://dvdnav.mplayerhq.hu/"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2000 Rich Wareham
+	2001-2004 the dvdnav project"
 SRC_URI="http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.0.tar.bz2"
 CHECKSUM_MD5="53be8903f9802e101929a3451203bbf6"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libdvdcss >= 1.20.10
-	media-libs/libdvdread >= 4.2.0"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="libdvdnav-${portVersion}.patch"
+
+PROVIDES="
+	libdvdnav${secondaryArchSuffix} = $portVersion
+	lib:libdvdnav
+	cmd:dvdnav_config
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	libdvdread${secondaryArchSuffix}
+	libdvdcss${secondaryArchSuffix}
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	libdvdread${secondaryArchSuffix}_devel
+	libdvdcss${secondaryArchSuffix}_devel
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	"
+
+SOURCE_DIR="libdvdnav-${portVersion}"
+
 BUILD()
 {
-	cd libdvdnav-4.2.0
 	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-			--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-			--enable-shared --enable-static
-	make
+	runConfigure ./configure --enable-shared --enable-static
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd libdvdnav-4.2.0
 	make install
+
+	# move headers to the correct location
+	mkdir -p $(dirname $includeDir)
+	mv $prefix/include $includeDir/
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libdvdnav libdvdnavmini
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
 }
 
-LICENSE="GNU GPL v2"
-COPYRIGHT="2000 Rich Wareham
-	2001-2004 the dvdnav project"
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libdvdnav${secondaryArchSuffix}_devel = $portVersion
+	devel:libdvdnav$secondaryArchSuffix = $portVersion
+	devel:libdvdnavmini$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	libdvdnav$secondaryArchSuffix == $portVersion base
+	"