diff --git a/net-mgmt/ipgen/Makefile b/net-mgmt/ipgen/Makefile
index 25d324f9d3b0..e2e33b19c453 100644
--- a/net-mgmt/ipgen/Makefile
+++ b/net-mgmt/ipgen/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	ipgen
 PORTVERSION=	1.30.20240527
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Interactive Packet Generator and Benchmarking Utility
 WWW=		https://github.com/iij/ipgen
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 USES=		gmake perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	iij
 GH_TAGNAME=	9e649f4
 
 SHEBANG_FILES=	gen/layout_generator
 MAKEFILE=	GNUmakefile
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=DOCS
 
 pre-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} -f ${MAKEFILE} depend
 pre-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 post-install-DOCS-on:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ipgen/files/patch-gen_compat.h b/net-mgmt/ipgen/files/patch-gen_compat.h
new file mode 100644
index 000000000000..373d113da027
--- /dev/null
+++ b/net-mgmt/ipgen/files/patch-gen_compat.h
@@ -0,0 +1,23 @@
+--- gen/compat.h.orig	2024-05-27 06:59:46 UTC
++++ gen/compat.h
+@@ -48,6 +48,7 @@
+ #define ETHERTYPE_FLOWCONTROL	0x8808
+ #endif
+ 
++#if !defined(__FreeBSD__) || defined(__i386__)
+ #ifndef atomic_fetchadd_32
+ #define	atomic_fetchadd_32(t, v) __atomic_fetch_add(t, v, __ATOMIC_CONSUME)
+ #endif
+@@ -67,10 +68,11 @@ atomic_cmpset_32(volatile uint32_t *p, uint32_t cmpval
+ 	bool ret = __atomic_compare_exchange_n(p, &cmpval, newval, false, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);
+ 	return ret ? 1 : 0;
+ }
+-#endif
++#endif /* !defined(__FreeBSD__) || defined(__i386__) */
+ 
+ #ifndef __unused
+ #define __unused	__attribute__((unused))
++#endif
+ #endif
+ 
+ #endif /* _COMPAT_H_ */
diff --git a/net-mgmt/ipgen/files/patch-gen_util.c b/net-mgmt/ipgen/files/patch-gen_util.c
new file mode 100644
index 000000000000..83dfd7f6a23d
--- /dev/null
+++ b/net-mgmt/ipgen/files/patch-gen_util.c
@@ -0,0 +1,14 @@
+--- gen/util.c.orig	2025-05-05 17:12:32 UTC
++++ gen/util.c
+@@ -351,7 +351,11 @@ getiflinkaddr(const char *ifname, struct ether_addr *a
+ 			if ((sdl->sdl_type == IFT_ETHER) &&
+ 			    (sdl->sdl_alen == ETHER_ADDR_LEN)) {
+ 
++#ifdef CLLADDR
+ 				memcpy(addr, (const struct ether_addr *)CLLADDR(sdl), ETHER_ADDR_LEN);
++#else
++				memcpy(addr, (const struct ether_addr *)LLADDR(sdl), ETHER_ADDR_LEN);
++#endif
+ 				found = 1;
+ 				break;
+ 			}
diff --git a/net-mgmt/ipgen/files/patch-libpkt-GNUmakefile b/net-mgmt/ipgen/files/patch-libpkt-GNUmakefile
index 7c76074a0089..21aea9fe2223 100644
--- a/net-mgmt/ipgen/files/patch-libpkt-GNUmakefile
+++ b/net-mgmt/ipgen/files/patch-libpkt-GNUmakefile
@@ -1,10 +1,21 @@
---- libpkt/GNUmakefile.orig	2024-02-29 01:38:00 UTC
+--- libpkt/GNUmakefile.orig	2024-05-27 06:59:46 UTC
 +++ libpkt/GNUmakefile
-@@ -8,7 +8,6 @@ SRCS+=		utils.c
+@@ -8,16 +8,15 @@ SRCS+=		utils.c
  SRCS+=		ip6pkt.c
  SRCS+=		utils.c
  
 -CFLAGS+=	-O2
  CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
  CFLAGS+=	-Wreturn-type -Wswitch -Wshadow
  CFLAGS+=	-Wcast-qual -Wwrite-strings
+ CFLAGS+=	-Wno-address-of-packed-member
+ 
+ # x86
+-CFLAGS+=	-DUSE_CPU_IN_CKSUM
++#CFLAGS+=	-DUSE_CPU_IN_CKSUM
+ SRCS+=		in_cksum.c
+-SRCS+=		cpu_in_cksum.S
++#SRCS+=		cpu_in_cksum.S
+ 
+ 
+ OBJS+=	$(patsubst %.S,%.o,$(SRCS:%.c=%.o))