diff --git a/sys-devel/m4/m4-1.4.18.recipe b/sys-devel/m4/m4-1.4.19.recipe
similarity index 60%
rename from sys-devel/m4/m4-1.4.18.recipe
rename to sys-devel/m4/m4-1.4.19.recipe
index 86ceb103e..83de1e91f 100644
--- a/sys-devel/m4/m4-1.4.18.recipe
+++ b/sys-devel/m4/m4-1.4.19.recipe
@@ -12,47 +12,61 @@ be used either as a front-end to a compiler or as a macro processor in its own \
 right.
 One of the biggest users of M4 is the GNU Autoconf project."
 HOMEPAGE="https://www.gnu.org/software/m4/"
-COPYRIGHT="2000, 2005-2016 Free Software Foundation, Inc."
+COPYRIGHT="2000, 2005-2014, 2016-2017, 2020-2021 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://ftp.gnu.org/gnu/m4/m4-$portVersion.tar.gz"
-CHECKSUM_SHA256="ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab"
+CHECKSUM_SHA256="3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70"
 
-ARCHITECTURES="all"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 PROVIDES="
-	m4 = $portVersion compat >= 1.4
-	cmd:m4 = $portVersion compat >= 1.4
+	m4$secondaryArchSuffix = $portVersion compat >= 1.4
+	cmd:m4$commandSuffix = $portVersion compat >= 1.4
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	REPLACES="
+		m4
+		"
+fi
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
-	cmd:gcc
+	cmd:cmp
+	cmd:gcc$secondaryArchSuffix
 	cmd:grep
 	cmd:help2man
-	cmd:ld
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
 
 TEST_REQUIRES="
-	cmd:cmp
 	cmd:diff
 	cmd:help2man
 	"
 
-defineDebugInfoPackage m4 \
-	$binDir/m4
+defineDebugInfoPackage m4$secondaryArchSuffix \
+	$commandBinDir/m4
 
 BUILD()
 {
-	runConfigure ./configure \
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
 		--with-gnu-ld \
 		--enable-changeword --disable-gcc-warnings
 	make $jobArgs
@@ -61,9 +75,6 @@ BUILD()
 INSTALL()
 {
 	make install
-
-	rm $libDir/charset.alias
-	rmdir $libDir
 }
 
 TEST()