diff --git a/devel/efivar/Makefile b/devel/efivar/Makefile
index 5a7c9bba6e2b..546f011ffd8f 100644
--- a/devel/efivar/Makefile
+++ b/devel/efivar/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	efivar
 PORTVERSION=	39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Tools and libraries to work with EFI variables
 WWW=		https://github.com/rhboot/efivar
 
 LICENSE=	LGPL21
 
 NOT_FOR_ARCHS=		powerpc powerpc64 powerpcspe
 NOT_FOR_ARCHS_REASON=	specification only supports little-endian processors
 BROKEN_FreeBSD_13=	requires at least FreeBSD 14
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES=		gmake pkgconfig python
 
 USE_GCC=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	rhboot
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 
 MAKE_ARGS+=	CC="${CC}" LIBDIR="${PREFIX}/lib" \
 		LDFLAGS="-Wl,-rpath,${PREFIX}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/efivar/files/patch-src_include_defaults.mk b/devel/efivar/files/patch-src_include_defaults.mk
index 9c56eb219471..bea3f5d98073 100644
--- a/devel/efivar/files/patch-src_include_defaults.mk
+++ b/devel/efivar/files/patch-src_include_defaults.mk
@@ -1,26 +1,35 @@
 --- src/include/defaults.mk.orig	2024-01-31 20:08:46 UTC
 +++ src/include/defaults.mk
 @@ -43,7 +43,6 @@ override CFLAGS = $(_CFLAGS) \
  override CFLAGS = $(_CFLAGS) \
  		  -std=gnu11 \
  		  -funsigned-char \
 -		  -fvisibility=hidden \
  		  $(call family,CFLAGS) \
  		  $(call pkg-config-cflags)
  LDFLAGS_CLANG ?= -rtlib=compiler-rt
 @@ -53,7 +52,6 @@ override LDFLAGS = $(CFLAGS) -L. $(_LDFLAGS) $(_CCLDFL
  override _LDFLAGS := $(LDFLAGS)
  override LDFLAGS = $(CFLAGS) -L. $(_LDFLAGS) $(_CCLDFLAGS) \
  		   -Wl,--build-id \
 -		   -Wl,--no-allow-shlib-undefined \
  		   -Wl,--no-undefined-version \
  		   -Wl,-z,now \
  		   -Wl,-z,muldefs \
+@@ -74,7 +72,7 @@ ifneq ($(HOST_ARCH),riscv64)
+ HOST_ARCH=$(shell uname -m)
+ ifneq ($(HOST_ARCH),ia64)
+ ifneq ($(HOST_ARCH),riscv64)
+-	HOST_MARCH=-march=native
++	HOST_MARCH=
+ else
+ 	HOST_MARCH=
+ endif
 @@ -99,7 +97,6 @@ override HOST_LDFLAGS = $(HOST_CFLAGS) -L. \
  override HOST_LDFLAGS = $(HOST_CFLAGS) -L. \
  			$(_HOST_LDFLAGS) $(_HOST_CCLDFLAGS) \
  			-Wl,--build-id \
 -			-Wl,--no-allow-shlib-undefined \
  			-Wl,-z,now \
  			-Wl,-z,muldefs \
  			$(call family,HOST_LDFLAGS) \