diff --git a/security/gokey/Makefile b/security/gokey/Makefile
index b9eb0d657dfb..5da77b144900 100644
--- a/security/gokey/Makefile
+++ b/security/gokey/Makefile
@@ -1,29 +1,37 @@
 PORTNAME=	gokey
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.3
-PORTREVISION=	8
+DISTVERSION=	0.2.0
 CATEGORIES=	security
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Simple password manager write in Go
 WWW=		https://github.com/cloudflare/gokey
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${LOCALBASE}/bin/go-md2man:textproc/go-md2man
+
 USES=		go:modules
 
 GO_MODULE=	github.com/cloudflare/gokey
 GO_TARGET=	./cmd/gokey
 
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} \
+		share/man/man1/${PORTNAME}.1.gz
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
+post-build:
+	go-md2man -in=${WRKSRC}/gokey.1.md -out=${WRKSRC}/gokey.1
+
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/gokey.1 ${STAGEDIR}${PREFIX}/share/man/man1
+
 .include <bsd.port.mk>
diff --git a/security/gokey/distinfo b/security/gokey/distinfo
index c73bec521cf1..ce321938bfb7 100644
--- a/security/gokey/distinfo
+++ b/security/gokey/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1747434941
-SHA256 (go/security_gokey/gokey-v0.1.3/v0.1.3.mod) = ad79ff30a189d8bc2b82304a17d2a9f4aa1f40244a806cf52ef851fbb977d722
-SIZE (go/security_gokey/gokey-v0.1.3/v0.1.3.mod) = 113
-SHA256 (go/security_gokey/gokey-v0.1.3/v0.1.3.zip) = e07dd6921bbea368a26b1445f42709837f1df2d9144739b14bb8c9e6fce944e4
-SIZE (go/security_gokey/gokey-v0.1.3/v0.1.3.zip) = 28472
+TIMESTAMP = 1763931529
+SHA256 (go/security_gokey/gokey-v0.2.0/v0.2.0.mod) = 6e5196f915dd9c621fa7095db89ee5ce561310db38f1f8986cb3b48b79cefa22
+SIZE (go/security_gokey/gokey-v0.2.0/v0.2.0.mod) = 161
+SHA256 (go/security_gokey/gokey-v0.2.0/v0.2.0.zip) = e71f61357b2f8c76765f5781a92a57f5c7a4aa24300467adaec335e414cd927b
+SIZE (go/security_gokey/gokey-v0.2.0/v0.2.0.zip) = 27560
diff --git a/security/gokey/files/patch-go.mod b/security/gokey/files/patch-go.mod
deleted file mode 100644
index 99bcac4b32fe..000000000000
--- a/security/gokey/files/patch-go.mod
+++ /dev/null
@@ -1,14 +0,0 @@
---- go.mod.orig	1979-11-29 16:00:00 UTC
-+++ go.mod
-@@ -1,8 +1,10 @@ module github.com/cloudflare/gokey
- module github.com/cloudflare/gokey
- 
--go 1.13
-+go 1.17
- 
- require (
- 	golang.org/x/crypto v0.17.0
- 	golang.org/x/term v0.15.0
- )
-+
-+require golang.org/x/sys v0.15.0 // indirect
diff --git a/security/gokey/files/patch-vendor_modules.txt b/security/gokey/files/patch-vendor_modules.txt
deleted file mode 100644
index e169e8c39333..000000000000
--- a/security/gokey/files/patch-vendor_modules.txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- vendor/modules.txt.orig	2025-05-16 22:37:27 UTC
-+++ vendor/modules.txt
-@@ -1,10 +1,13 @@
- # golang.org/x/crypto v0.17.0
-+## explicit; go 1.17
- golang.org/x/crypto/ed25519
- golang.org/x/crypto/hkdf
- golang.org/x/crypto/pbkdf2
- # golang.org/x/sys v0.15.0
-+## explicit; go 1.17
- golang.org/x/sys/plan9
- golang.org/x/sys/unix
- golang.org/x/sys/windows
- # golang.org/x/term v0.15.0
-+## explicit; go 1.17
- golang.org/x/term