diff --git a/media-libs/libcddb/libcddb-1.3.2.recipe b/media-libs/libcddb/libcddb-1.3.2.recipe
index 4e88f2272..60632a98d 100644
--- a/media-libs/libcddb/libcddb-1.3.2.recipe
+++ b/media-libs/libcddb/libcddb-1.3.2.recipe
@@ -1,27 +1,72 @@
+SUMMARY="CDDB access library"
 DESCRIPTION="A library for accessing a CDDB server" 
 HOMEPAGE="http://libcddb.sourceforge.net" 
 SRC_URI="http://prdownloads.sourceforge.net/libcddb/libcddb-1.3.2.tar.bz2"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="gettext >= 0.18.1.1-dev"
-CHECKSUM_MD5="8bb4a6f542197e8e9648ae597cd6bc8a"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	cmd:cddb_query
+	bin:cddb_query
+	libcddb${secondaryArchSuffix} = $portVersion
+	lib:libcddb
+"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libintl
+"
+
+BUILD_REQUIRES="
+	lib:libiconv
+	cmd:pkg_config
+"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:gettext
+	cmd:libtool
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	devel:libiconv
+"
+
+PATCH()
+{
+	sed -i "s,AM_CONFIG_HEADER,AC_CONFIG_HEADERS," configure.ac
+}
+
 BUILD()
 {
-	cd libcddb-1.3.2
 	libtoolize --force --copy --install
 	aclocal
-	automake
+	automake --add-missing
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd libcddb-1.3.2
 	make install
+	prepareInstalledDevelLibs libcddb
+	fixPkgconfig
+	packageEntries devel $developDir
 }
 
 LICENSE="GNU LGPL v2"
 COPYRIGHT="2003-2005 Kris Verbeeck"
 
+PROVIDES_devel="
+	libcddb${secondaryArchSuffix}_devel = $portVersion
+	devel:libcddb$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES_devel="
+	libcddb$secondaryArchSuffix == $portVersion base
+"
+