diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
deleted file mode 100644
index bf31ad732..000000000
--- a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
+++ /dev/null
@@ -1,73 +0,0 @@
-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="https://www.videolan.org/developers/libdvdnav.html"
-COPYRIGHT="2000 Rich Wareham
-	2001-2004 the dvdnav project"
-LICENSE="GNU GPL v2"
-REVISION="3"
-SOURCE_URI="https://download.videolan.org/pub/videolan/libdvdnav/libdvdnav-4.2.0.tar.bz2"
-CHECKSUM_SHA256="8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550"
-SOURCE_DIR="libdvdnav-${portVersion}"
-PATCHES="libdvdnav-${portVersion}.patch"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="
-	libdvdnav${secondaryArchSuffix} = $portVersion
-	cmd:dvdnav_config
-	lib:libdvdnav
-	"
-REQUIRES="
-	haiku${secondaryArchSuffix}
-	libdvdcss${secondaryArchSuffix}
-	libdvdread${secondaryArchSuffix}
-	"
-
-PROVIDES_devel="
-	libdvdnav${secondaryArchSuffix}_devel = $portVersion
-	devel:libdvdnav$secondaryArchSuffix = $portVersion
-	devel:libdvdnavmini$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	libdvdnav$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	libdvdcss${secondaryArchSuffix}_devel
-	libdvdread${secondaryArchSuffix}_devel
-	cmd:aclocal
-	cmd:autoconf
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	./autogen.sh
-	runConfigure ./configure --enable-shared --enable-static
-	make $jobArgs
-}
-
-INSTALL()
-{
-	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
-}
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
deleted file mode 100644
index 2c5efb53c..000000000
--- a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
+++ /dev/null
@@ -1,75 +0,0 @@
-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="https://www.videolan.org/developers/libdvdnav.html"
-COPYRIGHT="2000 Rich Wareham
-	2001-2004 the dvdnav project"
-LICENSE="GNU GPL v2"
-REVISION="4"
-SOURCE_URI="https://download.videolan.org/pub/videolan/libdvdnav/libdvdnav-$portVersion.tar.xz"
-CHECKSUM_SHA256="7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"
-SOURCE_DIR="libdvdnav-${portVersion}"
-PATCHES="libdvdnav-4.2.0.patch"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="
-	libdvdnav$secondaryArchSuffix = $portVersion
-	cmd:dvdnav_config$secondaryArchSuffix
-	lib:libdvdnav$secondaryArchSuffix
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	libdvdcss$secondaryArchSuffix
-	libdvdread$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libdvdnav${secondaryArchSuffix}_devel = $portVersion
-	devel:libdvdnav$secondaryArchSuffix = $portVersion
-	devel:libdvdnavmini$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	libdvdnav$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	libdvdcss${secondaryArchSuffix}_devel
-	libdvdread${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:aclocal
-	cmd:autoconf
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	./autogen.sh
-	runConfigure ./configure --enable-shared --enable-static
-	make $jobArgs
-}
-
-INSTALL()
-{
-	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
-}
diff --git a/media-libs/libdvdnav/libdvdnav-5.0.3.recipe b/media-libs/libdvdnav/libdvdnav-6.0.0.recipe
similarity index 85%
rename from media-libs/libdvdnav/libdvdnav-5.0.3.recipe
rename to media-libs/libdvdnav/libdvdnav-6.0.0.recipe
index 81c2e02b4..3440d56a8 100644
--- a/media-libs/libdvdnav/libdvdnav-5.0.3.recipe
+++ b/media-libs/libdvdnav/libdvdnav-6.0.0.recipe
@@ -1,14 +1,13 @@
-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."
+SUMMARY="DVD navigation library"
+DESCRIPTION="libdvdnav is a library that allows easy use of sophisticated DVD navigation \
+features such as DVD menus, multiangle playback and even interactive DVD games."
 HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
 COPYRIGHT="2000 Rich Wareham
 	2001-2004 the dvdnav project"
 LICENSE="GNU GPL v2"
-REVISION="6"
+REVISION="1"
 SOURCE_URI="https://download.videolan.org/pub/videolan/libdvdnav/$portVersion/libdvdnav-$portVersion.tar.bz2"
-CHECKSUM_SHA256="5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d"
+CHECKSUM_SHA256="f0a2711b08a021759792f8eb14bb82ff8a3c929bf88c33b64ffcddaa27935618" 
 PATCHES="libdvdnav-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
diff --git a/media-libs/libdvdnav/patches/libdvdnav-4.2.0.patch b/media-libs/libdvdnav/patches/libdvdnav-4.2.0.patch
deleted file mode 100644
index cbe9021c4..000000000
--- a/media-libs/libdvdnav/patches/libdvdnav-4.2.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libdvdnav-4.2.0/configure.ac	2011-10-07 20:20:59.001572864 +0000
-+++ libdvdnav-4.2.0-haiku/configure.ac	2012-04-09 16:41:25.801112064 +0000
-@@ -143,7 +143,7 @@
-     THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
-     CFLAGS="$THREAD_CFLAGS $CFLAGS"
-     ;;
--  *mingw32* | *cygwin*)
-+  *mingw32* | *cygwin* | *haiku*)
-     ;;
-   *)
-     AC_CHECK_LIB(pthread, pthread_create,
-@@ -168,6 +168,8 @@
-   *os2*)
-     LDFLAGS="-no-undefined -Zbin-files $LDFLAGS"
-     ;;
-+  *haiku*)
-+  	;;
-   *)
-     AC_CHECK_LIB(c, dlopen,
- 	         DYNAMIC_LD_LIBS="",
diff --git a/media-libs/libdvdnav/patches/libdvdnav-5.0.3.patchset b/media-libs/libdvdnav/patches/libdvdnav-6.0.0.patchset
similarity index 100%
rename from media-libs/libdvdnav/patches/libdvdnav-5.0.3.patchset
rename to media-libs/libdvdnav/patches/libdvdnav-6.0.0.patchset