diff --git a/media-libs/libcddb/libcddb-1.3.2.recipe b/media-libs/libcddb/libcddb-1.3.2.recipe
index eec5831a1..3954d81a4 100644
--- a/media-libs/libcddb/libcddb-1.3.2.recipe
+++ b/media-libs/libcddb/libcddb-1.3.2.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://libcddb.sourceforge.net"
 SRC_URI="http://prdownloads.sourceforge.net/libcddb/libcddb-1.3.2.tar.bz2"
 CHECKSUM_SHA256="35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b"
 REVISION="1"
-ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+ARCHITECTURES="x86 x86_gcc2 ?x86_64"
 
 PROVIDES="
 	cmd:cddb_query
@@ -16,6 +16,7 @@ PROVIDES="
 REQUIRES="
 	haiku${secondaryArchSuffix} >= $haikuVersion
 	lib:libintl
+	lib:libiconv
 "
 
 BUILD_REQUIRES="
@@ -41,6 +42,8 @@ PATCH()
 	sed -i "s,AM_CONFIG_HEADER,AC_CONFIG_HEADERS," configure.ac
 }
 
+PATCHES="libcddb-$portVersion.patchset"
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -48,7 +51,7 @@ BUILD()
 	automake --add-missing
 	autoconf
 	runConfigure ./configure
-	make
+	make $jobArgs
 }
 
 INSTALL()
@@ -59,6 +62,12 @@ INSTALL()
 	packageEntries devel $developDir
 }
 
+TEST()
+{
+	mkdir -p `finddir B_USER_CACHE_DIRECTORY`/.cddbslave
+	make check
+}
+
 LICENSE="GNU LGPL v2"
 COPYRIGHT="2003-2005 Kris Verbeeck"