diff --git a/app-shells/dash/dash-0.5.9.1.recipe b/app-shells/dash/dash-0.5.9.1.recipe
index d62baec48..f831ff413 100644
--- a/app-shells/dash/dash-0.5.9.1.recipe
+++ b/app-shells/dash/dash-0.5.9.1.recipe
@@ -12,20 +12,28 @@ REVISION="1"
 SOURCE_URI="https://git.kernel.org/pub/scm/utils/dash/dash.git/snapshot/dash-$portVersion.tar.gz"
 CHECKSUM_SHA256="3f747013a20a3a9d2932be1a6dd1b002ca5649849b649be0af8a8da80bd8a918"
 
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 PROVIDES="
-	dash = $portVersion
-	cmd:dash = $portVersion
+	dash$secondaryArchSuffix = $portVersion
+	cmd:dash$commandSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
-	lib:libreadline
-	lib:libncursesw
+	haiku$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix
+	lib:libncursesw$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
@@ -33,14 +41,14 @@ BUILD_PREREQUIRES="
 	cmd:autoheader
 	cmd:automake
 	cmd:awk
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	"
 
 BUILD()
 {
 	./autogen.sh
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir"
 	make $jobArgs LIBS="-lbsd"
 }
 
@@ -48,3 +56,8 @@ INSTALL()
 {
 	make install
 }
+
+TEST()
+{
+	make check
+}