diff --git a/app-forensics/aflplusplus/aflplusplus-3.12c.recipe b/app-forensics/aflplusplus/aflplusplus-3.12c.recipe
index 85d6baf8c..07934798c 100644
--- a/app-forensics/aflplusplus/aflplusplus-3.12c.recipe
+++ b/app-forensics/aflplusplus/aflplusplus-3.12c.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="2013-2016 Google Inc.
 	2017-2021 Andrea Fioraldi
 	2017-2021 Dominik Maier"
 LICENSE="Apache v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://github.com/AFLplusplus/AFLplusplus/archive/refs/tags/$portVersion.tar.gz"
 CHECKSUM_SHA256="0240d34a2f99d157063e31d0c2d2801a68bc015e09187d9cc197637ec8fda635"
 SOURCE_FILENAME="aflplusplus-$portVersion.tar.gz"
@@ -60,8 +60,8 @@ BUILD_REQUIRES="
 	devel:libLLVM_9$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:awk
-	cmd:clang_9
+	cmd:gawk
+	cmd:clang >= 9.0.1
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	"
@@ -74,7 +74,7 @@ TEST_REQUIRES="
 PATCH()
 {
 	# grabbed from Gentoo port
-	sed -i -e 's/-O3 -fno-unroll-loops//' -e 's/-j/-j1/g' GNUmakefile
+	sed -i -e 's/-O3 -fno-unroll-loops//' GNUmakefile
 }
 
 makeAfl()
@@ -86,12 +86,12 @@ makeAfl()
 		DOC_PATH=$docDir \
 		MISC_PATH=$dataDir/afl \
 		MAN_PATH=$manDir/man8 \
-		"$@"
+		"$@" V=1
 }
 
 BUILD()
 {
-	makeAfl -j1
+	makeAfl $jobArgs
 }
 
 INSTALL()
diff --git a/app-forensics/aflplusplus/patches/aflplusplus-3.12c.patchset b/app-forensics/aflplusplus/patches/aflplusplus-3.12c.patchset
index c32dd5c05..4109eb8f4 100644
--- a/app-forensics/aflplusplus/patches/aflplusplus-3.12c.patchset
+++ b/app-forensics/aflplusplus/patches/aflplusplus-3.12c.patchset
@@ -111,3 +111,27 @@ index 8df4bef..5935b76 100755
 -- 
 2.30.2
 
+
+From 298a69e24f1a8ea738438ac7019edc1532ffc674 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 9 Apr 2021 17:27:53 +0200
+Subject: Fix build on x86_64
+
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 542097a..58278e6 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -166,6 +166,9 @@ ifeq "$(shell uname -s)" "Haiku"
+   override CFLAGS  += -DUSEMMAP=1 -Wno-error=format -fPIC
+   LDFLAGS += -Wno-deprecated-declarations -lgnu -lnetwork
+   SPECIAL_PERFORMANCE += -DUSEMMAP=1
++  ifeq "$(shell uname -m)" "x86_64"
++	AFL_NO_X86=1
++  endif
+ endif
+ 
+ AFL_FUZZ_FILES = $(wildcard src/afl-fuzz*.c)
+-- 
+2.30.2
+