diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
index d2b3df7ec..caea7ece8 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
+++ b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
@@ -1,23 +1,70 @@
-DESCRIPTION="libdvdcss" 
+DESCRIPTION="libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption." 
+SUMMARY="libdvdcss"
 HOMEPAGE="http://www.videolan.org/developers/libdvdcss.html" 
+LICENSE="GNU GPL v2"
+COPYRIGHT="Copyright (C) 1998-2008 VideoLAN"
 SRC_URI="http://download.videolan.org/pub/libdvdcss/1.2.12/libdvdcss-1.2.12.tar.bz2"
 CHECKSUM_MD5="2218a193900e3203aa10dc24cdf54275"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="libdvdcss-${portVersion}.patch"
+
+PROVIDES="
+	libdvdcss${secondaryArchSuffix} = $portVersion
+	lib:libdvdcss
+	cmd:dvdcss_config
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	"
+
+SOURCE_DIR="libdvdcss-${portVersion}"
+
 BUILD()
 {
-	cd libdvdcss-1.2.12
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
 	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd libdvdcss-1.2.12
 	make install
-}
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libdvdcss
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
+} 
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libdvdcss${secondaryArchSuffix}_devel = $portVersion
+	devel:libdvdcss${secondaryArchSuffix} = $portVersion
+	"
+REQUIRES_devel="
+	libdvdcss${secondaryArchSuffix} == $portVersion base
+	"
+
diff --git a/media-libs/libdvdcss/patches/libdvdcss-1.2.12.patch b/media-libs/libdvdcss/patches/libdvdcss-1.2.12.patch
index ecfdd28be..33ce56c96 100644
--- a/media-libs/libdvdcss/patches/libdvdcss-1.2.12.patch
+++ b/media-libs/libdvdcss/patches/libdvdcss-1.2.12.patch
@@ -1,6 +1,15 @@
 diff -Naur libdvdcss-1.2.12/configure.ac libdvdcss-1.2.12-haiku/configure.ac
---- libdvdcss-1.2.12/configure.ac	2012-03-11 23:07:47.053739520 +0000
-+++ libdvdcss-1.2.12-haiku/configure.ac	2012-12-15 02:07:39.623378432 +0000
+--- libdvdcss-1.2.12/configure.ac	2012-03-11 18:07:47.032505856 -0500
++++ libdvdcss-1.2.12-haiku/configure.ac	2013-11-26 20:16:56.198180864 -0600
+@@ -5,7 +5,7 @@
+ AC_CANONICAL_SYSTEM
+ 
+ AM_INIT_AUTOMAKE(libdvdcss, 1.2.12)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_PROG_CC
+ AC_STDC_HEADERS
 @@ -35,7 +35,7 @@
                   AC_DEFINE(SYS_CYGWIN, 1, Have a Cygwin system.))
      AC_DEFINE(WIN32, 1, Using Win32.)