diff --git a/media-sound/libopenmpt/libopenmpt-0.2.7386~beta20.3.recipe b/media-sound/libopenmpt/libopenmpt-0.2.7386~beta20.3.recipe
index c0751c523..abe95a337 100644
--- a/media-sound/libopenmpt/libopenmpt-0.2.7386~beta20.3.recipe
+++ b/media-sound/libopenmpt/libopenmpt-0.2.7386~beta20.3.recipe
@@ -11,18 +11,19 @@ CHECKSUM_SHA256="a6a7e6da1ae66e1cf46985ee92c182e50652d71b96135e9fa6048e132d84475
 SOURCE_DIR="libopenmpt-${portVersion%~*}-autotools"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
 
-if [ "$targetArchitecture" != x86_gcc2 ]; then
-	commandBinDir=$binDir
-else
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
 	commandBinDir=$prefix/bin
 fi
 
 PROVIDES="
 	libopenmpt$secondaryArchSuffix = $portVersion
 	lib:libopenmpt$secondaryArchSuffix = 0.0.20 compat >= 0
-	cmd:openmpt123 = $portVersion
+	cmd:openmpt123$commandSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix