diff --git a/security/yubikey-agent/Makefile b/security/yubikey-agent/Makefile
index 827c57eb2faf..7ac4b55dc5c3 100644
--- a/security/yubikey-agent/Makefile
+++ b/security/yubikey-agent/Makefile
@@ -1,32 +1,30 @@
 PORTNAME=	yubikey-agent
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security sysutils
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Seamless ssh-agent for YubiKeys
 WWW=		https://filippo.io/yubikey-agent
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_i386=	constant 2148532270 overflows _Ctype_long
-
 LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 RUN_DEPENDS=	RSA_SecurID_getpasswd:devel/libccid
 
 USES=		go:modules
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	FiloSottile
 GH_TUPLE=	go-piv:piv-go:v1.7.0:go_piv_piv_go/vendor/github.com/go-piv/piv-go \
 	golang:crypto:83a5a9bb288b:golang_crypto/vendor/golang.org/x/crypto \
 	golang:sys:9a76102bfb43:golang_sys/vendor/golang.org/x/sys \
 	golang:term:2321bbc49cbf:golang_term/vendor/golang.org/x/term \
 	gopasspw:pinentry:v0.0.2:gopasspw_pinentry/vendor/github.com/gopasspw/pinentry \
 	pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/security/yubikey-agent/files/patch-vendor_github.com_go-piv_piv-go_piv_pcsc__freebsd.go b/security/yubikey-agent/files/patch-vendor_github.com_go-piv_piv-go_piv_pcsc__freebsd.go
new file mode 100644
index 000000000000..7b5f277f0a5d
--- /dev/null
+++ b/security/yubikey-agent/files/patch-vendor_github.com_go-piv_piv-go_piv_pcsc__freebsd.go
@@ -0,0 +1,12 @@
+armv7 build fix from github.com/gp-piv/piv-go upstream commit:
+https://github.com/go-piv/piv-go/commit/1902689552e974ba88750e3ab71902d253172ead
+
+--- vendor/github.com/go-piv/piv-go/piv/pcsc_freebsd.go.orig	2020-12-08 15:51:45 UTC
++++ vendor/github.com/go-piv/piv-go/piv/pcsc_freebsd.go
+@@ -26,5 +26,5 @@ func scCheck(rc C.long) error {
+ }
+ 
+ func isRCNoReaders(rc C.long) bool {
+-	return rc == 0x8010002E
++	return uint32(rc) == 0x8010002E
+ }