diff --git a/security/yubikey-agent/Makefile b/security/yubikey-agent/Makefile
index d4e40d372437..250431a5c3ac 100644
--- a/security/yubikey-agent/Makefile
+++ b/security/yubikey-agent/Makefile
@@ -1,30 +1,29 @@
 PORTNAME=	yubikey-agent
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.5
-PORTREVISION=	8
+DISTVERSION=	0.1.6
 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
 
 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
+GH_TUPLE=	go-piv:piv-go:v1.10.0:go_piv_piv_go/vendor/github.com/go-piv/piv-go \
+		golang:crypto:v0.4.0:golang_crypto/vendor/golang.org/x/crypto \
+		golang:sys:v0.3.0:golang_sys/vendor/golang.org/x/sys \
+		golang:term:v0.3.0:golang_term/vendor/golang.org/x/term \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
+		twpayne:go-pinentry-minimal:2a5dc4396c2a:twpayne_go_pinentry_minimal/vendor/github.com/twpayne/go-pinentry-minimal
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/security/yubikey-agent/distinfo b/security/yubikey-agent/distinfo
index fe60816d47ab..e759fb4d1fa8 100644
--- a/security/yubikey-agent/distinfo
+++ b/security/yubikey-agent/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1628942231
-SHA256 (FiloSottile-yubikey-agent-v0.1.5_GH0.tar.gz) = 724b21f05d3f822acd222ecc8a5d8ca64c82d5304013e088d2262795da81ca4f
-SIZE (FiloSottile-yubikey-agent-v0.1.5_GH0.tar.gz) = 11605
-SHA256 (go-piv-piv-go-v1.7.0_GH0.tar.gz) = 3674b08df418e4ad0548b532c32795ade5783e54a674a4834ba05cf1cb412333
-SIZE (go-piv-piv-go-v1.7.0_GH0.tar.gz) = 37132
-SHA256 (golang-crypto-83a5a9bb288b_GH0.tar.gz) = c6aa1fc9104536c3335135c9c0bf5a9c2ee3cedc05a937a24cee93aa21a72d80
-SIZE (golang-crypto-83a5a9bb288b_GH0.tar.gz) = 1726653
-SHA256 (golang-sys-9a76102bfb43_GH0.tar.gz) = 5bbc9c4e02f8ffa73c0f1baa3d0cbd4fc987b5daf08373f669673b8d651afb1b
-SIZE (golang-sys-9a76102bfb43_GH0.tar.gz) = 1115608
-SHA256 (golang-term-2321bbc49cbf_GH0.tar.gz) = 72896f6aa3deb053da5b597ab072ba5c3540b29d0fb56f350397b7f94c010e21
-SIZE (golang-term-2321bbc49cbf_GH0.tar.gz) = 15281
-SHA256 (gopasspw-pinentry-v0.0.2_GH0.tar.gz) = 55bfcc25962b7c498ae275d3a8ee787994c9468d298b326a46c51100c412033f
-SIZE (gopasspw-pinentry-v0.0.2_GH0.tar.gz) = 3128
+TIMESTAMP = 1672409879
+SHA256 (FiloSottile-yubikey-agent-v0.1.6_GH0.tar.gz) = f156d089376772a34d2995f8261d821369a96a248ab586d27e3be0d9b72d7426
+SIZE (FiloSottile-yubikey-agent-v0.1.6_GH0.tar.gz) = 11378
+SHA256 (go-piv-piv-go-v1.10.0_GH0.tar.gz) = 062a8e4278ef03299d58d191c9119751e45061cb60b345f227868e62feab3682
+SIZE (go-piv-piv-go-v1.10.0_GH0.tar.gz) = 43012
+SHA256 (golang-crypto-v0.4.0_GH0.tar.gz) = 173d2ced255ce3b52fd6ad17903ea3a037161b243dd70d874c7534c8362c6108
+SIZE (golang-crypto-v0.4.0_GH0.tar.gz) = 1633454
+SHA256 (golang-sys-v0.3.0_GH0.tar.gz) = e0b14604be069f1ceb6958f8539c49d37f7033bcd03c59e3482164f4be0973f8
+SIZE (golang-sys-v0.3.0_GH0.tar.gz) = 1410672
+SHA256 (golang-term-v0.3.0_GH0.tar.gz) = cb06278319dc6a091453ce9fda106579cbbde8fc2522573912e0f405a2440352
+SIZE (golang-term-v0.3.0_GH0.tar.gz) = 14796
 SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
 SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
+SHA256 (twpayne-go-pinentry-minimal-2a5dc4396c2a_GH0.tar.gz) = ac1e2ac1bf95a23cae1daacf9d42ec17d05f5f5a269943bf1e1430b54a35e7a0
+SIZE (twpayne-go-pinentry-minimal-2a5dc4396c2a_GH0.tar.gz) = 6836