diff --git a/net-analyzer/nmap/nmap-3.81.recipe b/net-analyzer/nmap/nmap-3.81.recipe
index 28c7520b1..2aee71649 100644
--- a/net-analyzer/nmap/nmap-3.81.recipe
+++ b/net-analyzer/nmap/nmap-3.81.recipe
@@ -18,36 +18,42 @@ scan results (Ndiff), and a packet generation and response analysis tool \
 HOMEPAGE="https://nmap.org/"
 COPYRIGHT="1996–2005 The Nmap Project"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://nmap.org/dist-old/nmap-$portVersion.tgz"
 CHECKSUM_SHA256="4ab4044b2c8a44466409f668919156b4d8429e0449c6c482ea2063730d727293"
 PATCHES="nmap-$portVersion.patchset"
 
-ARCHITECTURES="all"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	nmap = $portVersion
+	nmap$secondaryArchSuffix = $portVersion
 	cmd:nmap = $portVersion
 	"
 REQUIRES="
-	haiku
-	lib:libpcap
-	lib:libpcre
-	lib:libssl
+	haiku$secondaryArchSuffix
+	lib:libpcap$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libpcap
-	devel:libpcre
-	devel:libssl
+	haiku${secondaryArchSuffix}_devel
+	devel:libpcap$secondaryArchSuffix
+	devel:libpcre$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	"
+if [ $effectiveTargetArchitecture = x86 ]; then
+	REPLACES="
+		nmap
+		"
+fi
 
 BUILD()
 {
@@ -56,8 +62,9 @@ BUILD()
 	libtoolize --force --copy --install
 	popd
 
-	runConfigure --omit-dirs "dataRootDir docDir" \
-		./configure  --without-nmapfe LDFLAGS=-lnetwork
+	runConfigure --omit-dirs "binDir dataRootDir docDir" \
+		./configure --bindir="$prefix/bin" \
+			--without-nmapfe LDFLAGS=-lnetwork
 	# not multi-job safe
 	make
 }