diff --git a/haiku-apps/cdplayer/cdplayer-1.0.recipe b/haiku-apps/cdplayer/cdplayer-1.0.recipe
index 8281aed6e..a71583d8b 100644
--- a/haiku-apps/cdplayer/cdplayer-1.0.recipe
+++ b/haiku-apps/cdplayer/cdplayer-1.0.recipe
@@ -10,7 +10,7 @@ In that case you're better off mounting the CD in Tracker and use \
 MediaPlayer to play back the audio files in its wav folder.
 "
 HOMEPAGE="https://github.com/HaikuArchives/CDPlayer"
-SRC_URI="git://github.com/HaikuArchives/CDPlayer#015f84c84f495fd6d635b8646be54eb2f13579c5"
+SRC_URI="git://github.com/HaikuArchives/CDPlayer#f7e839c39669be0f5119941eda30231be522ad97"
 LICENSE="Be Sample Code License
 	MIT"
 COPYRIGHT="1992-2000, Be Incorporated
@@ -18,22 +18,24 @@ COPYRIGHT="1992-2000, Be Incorporated
 	"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
 PROVIDES="
-	CDPlayer = $portVersion
-	app:CDPlayer = $portVersion
+	CDPlayer$secondaryArchSuffix = $portVersion
+	app:CDPlayer$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
 
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:gcc
+	cmd:g++$secondaryArchSuffix
 	cmd:make
 	cmd:mkdepend
 	"
@@ -41,13 +43,12 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	cd src
-	make $jobArgs
+	make $jobArgs OBJ_DIR=objects
 }
 
 INSTALL()
 {
 	mkdir -p $appsDir
-	ARCH=$(echo $buildArchitecture | sed 's/_/-/g')	
-	cp -af src/objects.$ARCH-release/CDPlayer $appsDir
+	cp -af src/objects/CDPlayer $appsDir
 	addAppDeskbarSymlink $appsDir/CDPlayer
 }