diff --git a/net/pkt-gen/Makefile b/net/pkt-gen/Makefile
index 9116fb981608..8f356ac50910 100644
--- a/net/pkt-gen/Makefile
+++ b/net/pkt-gen/Makefile
@@ -1,39 +1,36 @@
 PORTNAME=	pkt-gen
 PORTVERSION=	g2022.02.10
 CATEGORIES=	net
 
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	Packet sink/source using the netmap API
 
 LICENSE=	BSD2CLAUSE
 
-NOT_FOR_ARCHS=	i386
-NOT_FOR_ARCHS_REASON=	Not supported on i386
-
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	luigirizzo
 GH_PROJECT=	netmap
 GH_TAGNAME=	278045b
 MAKEFILE=	GNUmakefile
 
 OPTIONS_DEFINE=	PCAP
 PCAP_DESC=	Support loading packets from pcap file
 OPTIONS_DEFAULT=	PCAP
 PCAP_MAKE_ARGS=	WITH_PCAP=1
 
 PLIST_FILES=	bin/pkt-gen \
 		bin/nmreplay
 
 do-build:
 	cd ${WRKSRC}/libnetmap && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${MAKE_FLAGS} ${MAKEFILE}
 	cd ${WRKSRC}/apps/pkt-gen && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${MAKE_FLAGS} ${MAKEFILE}
 	cd ${WRKSRC}/apps/nmreplay && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${MAKE_FLAGS} ${MAKEFILE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/apps/pkt-gen/pkt-gen \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/apps/nmreplay/nmreplay \
 		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile b/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile
new file mode 100644
index 000000000000..01f487791835
--- /dev/null
+++ b/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile
@@ -0,0 +1,12 @@
+--- apps/nmreplay/GNUmakefile.orig	2022-02-11 07:45:02 UTC
++++ apps/nmreplay/GNUmakefile
+@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/nmreplay
+ 
+ NO_MAN=
+ CFLAGS = -O2 # -pipe -g
+-CFLAGS += -Werror -Wall -Wunused-function
++CFLAGS += -Wall -Wunused-function
++CFLAGS += -Wall -Wunused-function
+ CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include -I $(SRCDIR)/libnetmap
+ CFLAGS += -Wextra
+ 
diff --git a/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c b/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c
index 435de25f65a6..7fa0b0b52463 100644
--- a/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c
+++ b/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c
@@ -1,11 +1,11 @@
---- apps/nmreplay/nmreplay.c.orig	2021-11-25 23:16:06 UTC
+--- apps/nmreplay/nmreplay.c.orig	2022-02-11 07:45:02 UTC
 +++ apps/nmreplay/nmreplay.c
-@@ -1280,7 +1280,7 @@ main(int argc, char **argv)
+@@ -1273,7 +1273,7 @@ main(int argc, char **argv)
  	D("exiting on abort");
  	sleep(1);
  
 -	return (0);
 +	return (err);
  }
  
  /* conversion factor for numbers.
diff --git a/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile b/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile
new file mode 100644
index 000000000000..f401d30bd9e8
--- /dev/null
+++ b/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile
@@ -0,0 +1,12 @@
+--- apps/pkt-gen/GNUmakefile.orig	2022-02-11 07:45:02 UTC
++++ apps/pkt-gen/GNUmakefile
+@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/pkt-gen
+ 
+ NO_MAN=
+ CFLAGS = -O2 -pipe
+-CFLAGS += -Werror -Wall -Wunused-function
++CFLAGS += -Wall -Wunused-function
++CFLAGS += -Wall -Wunused-function
+ CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include -I $(SRCDIR)/libnetmap
+ CFLAGS += -Wextra -Wno-address-of-packed-member
+ 
diff --git a/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c b/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c
new file mode 100644
index 000000000000..b059e6c79370
--- /dev/null
+++ b/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c
@@ -0,0 +1,13 @@
+--- apps/pkt-gen/pkt-gen.c.orig	2022-06-08 23:21:01 UTC
++++ apps/pkt-gen/pkt-gen.c
+@@ -3251,8 +3251,8 @@ out:
+ 		g.tx_period.tv_nsec = g.tx_period.tv_nsec % 1000000000;
+ 	}
+ 	if (g.td_type == TD_TYPE_SENDER)
+-	    D("Sending %d packets every  %ld.%09ld s",
+-			g.burst, g.tx_period.tv_sec, g.tx_period.tv_nsec);
++	    D("Sending %d packets every  %lld.%09ld s",
++			g.burst, (long long)g.tx_period.tv_sec, g.tx_period.tv_nsec);
+ 	/* Install ^C handler. */
+ 	global_nthreads = g.nthreads;
+ 	sigemptyset(&ss);
diff --git a/net/pkt-gen/files/patch-libnetmap_GNUmakefile b/net/pkt-gen/files/patch-libnetmap_GNUmakefile
new file mode 100644
index 000000000000..ba04a18d3b2d
--- /dev/null
+++ b/net/pkt-gen/files/patch-libnetmap_GNUmakefile
@@ -0,0 +1,11 @@
+--- libnetmap/GNUmakefile.orig	2022-02-11 07:45:02 UTC
++++ libnetmap/GNUmakefile
+@@ -1,6 +1,7 @@
+ SRCDIR ?= ../
+ PREFIX ?= usr/local
+-CFLAGS=-O2 -pipe -Wall -Werror
++CFLAGS=-O2 -pipe -Wall
++CFLAGS=-O2 -pipe -Wall
+ CFLAGS +=-g
+ CFLAGS += -I $(SRCDIR)/sys
+ VPATH = $(SRCDIR)/libnetmap