diff --git a/media-libs/libbluray/libbluray-0.2.2.recipe b/media-libs/libbluray/libbluray-0.2.2.recipe
deleted file mode 100644
index 1a001d1fb..000000000
--- a/media-libs/libbluray/libbluray-0.2.2.recipe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION="libbluray" 
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html" 
-SRC_URI="ftp://ftp.videolan.org/pub/videolan/libbluray/0.2.2/libbluray-0.2.2.tar.bz2"
-CHECKSUM_MD5="cb3254de43276861ea6b07c603f4651c"
-REVISION="1"
-STATUS_HAIKU="stable"
-MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND=""
-BUILD()
-{
-	cd libbluray-0.2.2
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` 
-	make
-}
-
-INSTALL()
-{
-	cd libbluray-0.2.2
-	make install
-}
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2010, hpi1
-			2010, fraxinas
-			2010, John Stebbins
-			2010, Joakim
-			2010, Obliter0n
-			2010, William Hahne"
diff --git a/media-libs/libbluray/libbluray-0.6.2.recipe b/media-libs/libbluray/libbluray-0.6.2.recipe
new file mode 100644
index 000000000..bb70295c0
--- /dev/null
+++ b/media-libs/libbluray/libbluray-0.6.2.recipe
@@ -0,0 +1,85 @@
+SUMMARY="Portable Network Graphics library"
+DESCRIPTION="
+libbluray is the official PNG reference library. It supports almost all PNG \
+features, is extensible, and has been extensively tested for over 17 years
+"
+HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
+COPYRIGHT="
+	1998-2011 Glenn Randers-Pehrson
+	1996-1997 Andreas Dilger
+	1995-1996 Guy Eric Schalnat, Group 42, Inc.
+	"
+LICENSE="LibPNG"
+SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/$portVersion/libbluray-$portVersion.tar.bz2"
+CHECKSUM_SHA256="8ca410c8a4a1e2e8344014a67e2c908182cff3e04ece4e3b9ef196cf6bca5cd0"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+    # x86_gcc2 is fine as primary target architecture as long as we're building
+    # for a different secondary architecture.
+    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	libbluray$secondaryArchSuffix = $portVersion compat >= 0.6
+	lib:libbluray$secondaryArchSuffix = 1.6.2 compat >= 1
+	cmd:bd_info$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libfreetype$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	# required by freetype
+	lib:libbz2$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libfreetype$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	# required by freetype
+	devel:libbz2$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	autoreconf -fi
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libbluray
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libbluray${secondaryArchSuffix}_devel = $portVersion compat >= 0.6
+	devel:libbluray$secondaryArchSuffix = 1.6.2 compat >= 1
+	"
+REQUIRES_devel="
+	libbluray$secondaryArchSuffix == $portVersion base
+	"