diff --git a/app-arch/p7zip/p7zip-17.03.recipe b/app-arch/p7zip/p7zip-17.03.recipe
index 1eb8719fe..33b62e3d0 100644
--- a/app-arch/p7zip/p7zip-17.03.recipe
+++ b/app-arch/p7zip/p7zip-17.03.recipe
@@ -5,30 +5,36 @@ OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
 HOMEPAGE="http://p7zip.sourceforge.net"
 COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/jinfeihan57/p7zip/archive/v$portVersion/p7zip-$portVersion.tar.gz"
 CHECKSUM_SHA256="bb4b9b21584c0e076e0b4b2705af0dbe7ac19d378aa7f09a79da33a5b3293187"
 PATCHES="p7zip-$portVersion.patchset"
 ADDITIONAL_FILES="p7zip-expander-rules"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	p7zip = $portVersion
+	p7zip$secondaryArchSuffix = $portVersion
 	cmd:7za = $portVersion compat >= 9
 	"
 REQUIRES="
-	haiku
-	lib:libiconv
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	REPLACES="
+		p7zip
+		"
+fi
 
 BUILD_REQUIRES="
-	devel:libiconv
+	haiku${secondaryArchSuffix}_devel
+	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	"