diff --git a/media-libs/libcuefile/libcuefile-r475.recipe b/media-libs/libcuefile/libcuefile-475.recipe
similarity index 80%
rename from media-libs/libcuefile/libcuefile-r475.recipe
rename to media-libs/libcuefile/libcuefile-475.recipe
index c8499dc00..7176d3eac 100644
--- a/media-libs/libcuefile/libcuefile-r475.recipe
+++ b/media-libs/libcuefile/libcuefile-475.recipe
@@ -1,16 +1,16 @@
 SUMMARY="Cue File library from Musepack"
 DESCRIPTION="A library to work with CUE files"
-HOMEPAGE="https://www.musepack.net"
+HOMEPAGE="https://www.musepack.net/"
 COPYRIGHT="1997-2011 Musepack Project"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="http://files.musepack.net/source/libcuefile_r475.tar.gz"
+SOURCE_URI="http://files.musepack.net/source/libcuefile_r$portVersion.tar.gz"
 CHECKSUM_SHA256="b681ca6772b3f64010d24de57361faecf426ee6182f5969fcf29b3f649133fe7"
-SOURCE_DIR="libcuefile_r475"
+SOURCE_DIR="libcuefile_r$portVersion"
 PATCHES="libcuefile-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libcuefile$secondaryArchSuffix = $portVersion
@@ -27,8 +27,11 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libcuefile$secondaryArchSuffix == $portVersion base
 	"
-BUILD_PREREQUIRES="
+
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libcuefile/patches/libcuefile-r475.patchset b/media-libs/libcuefile/patches/libcuefile-475.patchset
similarity index 100%
rename from media-libs/libcuefile/patches/libcuefile-r475.patchset
rename to media-libs/libcuefile/patches/libcuefile-475.patchset
diff --git a/media-libs/libreplaygain/libreplaygain-r475.recipe b/media-libs/libreplaygain/libreplaygain-475.recipe
similarity index 82%
rename from media-libs/libreplaygain/libreplaygain-r475.recipe
rename to media-libs/libreplaygain/libreplaygain-475.recipe
index 85fb92812..ad818d7f4 100644
--- a/media-libs/libreplaygain/libreplaygain-r475.recipe
+++ b/media-libs/libreplaygain/libreplaygain-475.recipe
@@ -1,16 +1,16 @@
 SUMMARY="Replay Gain library from Musepack"
 DESCRIPTION="libreplaygain calculates the perceived loudness of audio and \
 suggests dB adjustments according to the ReplayGain standard."
-HOMEPAGE="https://www.musepack.net"
+HOMEPAGE="https://www.musepack.net/"
 COPYRIGHT="1997-2011 Musepack Project"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="http://files.musepack.net/source/libreplaygain_r475.tar.gz"
+SOURCE_URI="http://files.musepack.net/source/libreplaygain_r$portVersion.tar.gz"
 CHECKSUM_SHA256="8258bf785547ac2cda43bb195e07522f0a3682f55abe97753c974609ec232482"
-SOURCE_DIR="libreplaygain_r475"
+SOURCE_DIR="libreplaygain_r$portVersion"
 
-ARCHITECTURES="x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libreplaygain$secondaryArchSuffix = $portVersion
diff --git a/media-sound/musepack_tools/musepack_tools-r475.recipe b/media-sound/musepack_tools/musepack_tools-475.recipe
similarity index 81%
rename from media-sound/musepack_tools/musepack_tools-r475.recipe
rename to media-sound/musepack_tools/musepack_tools-475.recipe
index 2988ab43d..e2405fc2d 100644
--- a/media-sound/musepack_tools/musepack_tools-r475.recipe
+++ b/media-sound/musepack_tools/musepack_tools-475.recipe
@@ -3,17 +3,18 @@ DESCRIPTION="Musepack or MPC is an open source lossy audio codec, specifically \
 optimized for transparent compression of stereo audio at bitrates of 160-180 \
 (manual set allows bitrates up to 320) kbit/s. It was formerly known as \
 MPEGplus, MPEG+ or MP+."
-HOMEPAGE="https://www.musepack.net"
+HOMEPAGE="https://www.musepack.net/"
 COPYRIGHT="1997-2011  Andree Buschmann, Frank Klemm"
 LICENSE="BSD (3-clause)
 	GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="http://files.musepack.net/source/musepack_src_r475.tar.gz"
-SOURCE_DIR="musepack_src_r475"
-PATCHES="musepack_tools-r475.patchset"
+SOURCE_URI="http://files.musepack.net/source/musepack_src_r$portVersion.tar.gz"
+CHECKSUM_SHA256="a4b1742f997f83e1056142d556a8c20845ba764b70365ff9ccf2e3f81c427b2b"
+SOURCE_DIR="musepack_src_r$portVersion"
+PATCHES="musepack_tools-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	musepack_tools$secondaryArchSuffix = $portVersion
diff --git a/media-sound/musepack_tools/patches/musepack_tools-r475.patchset b/media-sound/musepack_tools/patches/musepack_tools-475.patchset
similarity index 100%
rename from media-sound/musepack_tools/patches/musepack_tools-r475.patchset
rename to media-sound/musepack_tools/patches/musepack_tools-475.patchset