diff --git a/dev-libs/orcus/orcus-0.17.2.recipe b/dev-libs/orcus/orcus-0.17.2.recipe
index f6f706607..39943426a 100644
--- a/dev-libs/orcus/orcus-0.17.2.recipe
+++ b/dev-libs/orcus/orcus-0.17.2.recipe
@@ -8,32 +8,24 @@ LICENSE="MPL v2.0"
 REVISION="2"
 SOURCE_URI="https://gitlab.com/orcus/orcus/-/archive/$portVersion/orcus-$portVersion.tar.bz2"
 CHECKSUM_SHA256="79fcc2998191fe5853a05edafe97a04d73e45d95d38237ad03500fe266f03503"
-SOURCE_DIR="orcus-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 boostMinimumVersion=1.69.0
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 soVersion="${portVersion%.*}"
 ixionSoVersion=$soVersion
 
 PROVIDES="
 	orcus$secondaryArchSuffix = $portVersion
-	cmd:orcus_css_dump$secondaryArchSuffix = $portVersion
-	cmd:orcus_csv$secondaryArchSuffix = $portVersion
-	cmd:orcus_detect$secondaryArchSuffix = $portVersion
-	cmd:orcus_gnumeric$secondaryArchSuffix = $portVersion
-	cmd:orcus_json$secondaryArchSuffix = $portVersion
-	cmd:orcus_mso_encryption$secondaryArchSuffix = $portVersion
-	cmd:orcus_ods$secondaryArchSuffix = $portVersion
-	cmd:orcus_styles_ods$secondaryArchSuffix = $portVersion
-	cmd:orcus_xls_xml$secondaryArchSuffix = $portVersion
-	cmd:orcus_xlsx$secondaryArchSuffix = $portVersion
-	cmd:orcus_xml$secondaryArchSuffix = $portVersion
-	cmd:orcus_xml_dump$secondaryArchSuffix = $portVersion
-	cmd:orcus_yaml$secondaryArchSuffix = $portVersion
-	cmd:orcus_zip_dump$secondaryArchSuffix = $portVersion
 	lib:liborcus_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
 	lib:liborcus_mso_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
 	lib:liborcus_parser_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
@@ -62,6 +54,28 @@ REQUIRES_devel="
 	devel:libixion_$ixionSoVersion$secondaryArchSuffix
 	"
 
+PROVIDES_tools="
+	orcus${secondaryArchSuffix}_tools = $portVersion
+	cmd:orcus_css_dump$commandSuffix = $portVersion
+	cmd:orcus_csv$commandSuffix = $portVersion
+	cmd:orcus_detect$commandSuffix = $portVersion
+	cmd:orcus_gnumeric$commandSuffix = $portVersion
+	cmd:orcus_json$commandSuffix = $portVersion
+	cmd:orcus_mso_encryption$commandSuffix = $portVersion
+	cmd:orcus_ods$commandSuffix = $portVersion
+	cmd:orcus_styles_ods$commandSuffix = $portVersion
+	cmd:orcus_xls_xml$commandSuffix = $portVersion
+	cmd:orcus_xlsx$commandSuffix = $portVersion
+	cmd:orcus_xml$commandSuffix = $portVersion
+	cmd:orcus_xml_dump$commandSuffix = $portVersion
+	cmd:orcus_yaml$commandSuffix = $portVersion
+	cmd:orcus_zip_dump$commandSuffix = $portVersion
+	"
+REQUIRES_tools="
+	orcus$secondaryArchSuffix == $portVersion base
+	$REQUIRES
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libboost_date_time$secondaryArchSuffix >= $boostMinimumVersion
@@ -85,19 +99,19 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage orcus$secondaryArchSuffix \
-	$binDir/orcus-css-dump \
-	$binDir/orcus-csv \
-	$binDir/orcus-detect \
-	$binDir/orcus-gnumeric \
-	$binDir/orcus-json \
-	$binDir/orcus-mso-encryption \
-	$binDir/orcus-ods \
-	$binDir/orcus-styles-ods \
-	$binDir/orcus-xls-xml \
-	$binDir/orcus-xlsx \
-	$binDir/orcus-xml \
-	$binDir/orcus-yaml \
-	$binDir/orcus-zip-dump \
+	$(getPackagePrefix tools)/bin/orcus-css-dump \
+	$(getPackagePrefix tools)/bin/orcus-csv \
+	$(getPackagePrefix tools)/bin/orcus-detect \
+	$(getPackagePrefix tools)/bin/orcus-gnumeric \
+	$(getPackagePrefix tools)/bin/orcus-json \
+	$(getPackagePrefix tools)/bin/orcus-mso-encryption \
+	$(getPackagePrefix tools)/bin/orcus-ods \
+	$(getPackagePrefix tools)/bin/orcus-styles-ods \
+	$(getPackagePrefix tools)/bin/orcus-xls-xml \
+	$(getPackagePrefix tools)/bin/orcus-xlsx \
+	$(getPackagePrefix tools)/bin/orcus-xml \
+	$(getPackagePrefix tools)/bin/orcus-yaml \
+	$(getPackagePrefix tools)/bin/orcus-zip-dump \
 	$libDir/liborcus-$soVersion.so.0.0.0 \
 	$libDir/liborcus-mso-$soVersion.so.0.0.0 \
 	$libDir/liborcus-parser-$soVersion.so.0.0.0 \
@@ -113,7 +127,9 @@ BUILD()
 {
 	autoreconf -fi
 	BOOST_ROOT=$portPackageLinksDir/devel~libboost_program_options/develop
-	runConfigure ./configure --disable-python \
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--disable-python \
 		--disable-static
 	make $jobArgs
 }
@@ -131,6 +147,9 @@ INSTALL()
 
 	packageEntries devel \
 		$developDir
+
+	packageEntries tools \
+		"$commandBinDir"
 }
 
 TEST()