diff --git a/media-libs/libmtp/libmtp-1.1.14.recipe b/media-libs/libmtp/libmtp-1.1.14.recipe
index 2d5715158..f061e4ad7 100644
--- a/media-libs/libmtp/libmtp-1.1.14.recipe
+++ b/media-libs/libmtp/libmtp-1.1.14.recipe
@@ -15,38 +15,39 @@ CHECKSUM_SHA256="3817d3e296be8f1bc527385585780e70984e8e0d6a0d00349240d67e3df412e
 PATCHES="libmtp-$portVersion.patchset"
 
 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="
 	libmtp$secondaryArchSuffix = $portVersion compat >= 1.0
 	lib:libmtp$secondaryArchSuffix = 9.3.0 compat >= 9
-	cmd:mtp_albumart
-	cmd:mtp_albums
-	cmd:mtp_connect
-	cmd:mtp_delfile
-	cmd:mtp_detect
-	cmd:mtp_emptyfolders
-	cmd:mtp_files
-	cmd:mtp_filetree
-	cmd:mtp_folders
-	cmd:mtp_format
-	cmd:mtp_getfile
-	cmd:mtp_getplaylist
-	cmd:mtp_newfolder
-	cmd:mtp_newplaylist
-	cmd:mtp_playlists
-	cmd:mtp_reset
-	cmd:mtp_sendfile
-	cmd:mtp_sendtr
-	cmd:mtp_thumb
-	cmd:mtp_tracks
-	cmd:mtp_trexist
+	cmd:mtp_albumart$commandSuffix = $portVersion
+	cmd:mtp_albums$commandSuffix = $portVersion
+	cmd:mtp_connect$commandSuffix = $portVersion
+	cmd:mtp_delfile$commandSuffix = $portVersion
+	cmd:mtp_detect$commandSuffix = $portVersion
+	cmd:mtp_emptyfolders$commandSuffix = $portVersion
+	cmd:mtp_files$commandSuffix = $portVersion
+	cmd:mtp_filetree$commandSuffix = $portVersion
+	cmd:mtp_folders$commandSuffix = $portVersion
+	cmd:mtp_format$commandSuffix = $portVersion
+	cmd:mtp_getfile$commandSuffix = $portVersion
+	cmd:mtp_getplaylist$commandSuffix = $portVersion
+	cmd:mtp_newfolder$commandSuffix = $portVersion
+	cmd:mtp_newplaylist$commandSuffix = $portVersion
+	cmd:mtp_playlists$commandSuffix = $portVersion
+	cmd:mtp_reset$commandSuffix = $portVersion
+	cmd:mtp_sendfile$commandSuffix = $portVersion
+	cmd:mtp_sendtr$commandSuffix = $portVersion
+	cmd:mtp_thumb$commandSuffix = $portVersion
+	cmd:mtp_tracks$commandSuffix = $portVersion
+	cmd:mtp_trexist$commandSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix