diff --git a/devel/git-lfs/Makefile b/devel/git-lfs/Makefile
index a3ff49b4e94f..a99d597120a4 100644
--- a/devel/git-lfs/Makefile
+++ b/devel/git-lfs/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	git-lfs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.0.2
-PORTREVISION=	23
+DISTVERSION=	3.5.1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Git extension for versioning large files
 WWW=		https://git-lfs.github.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	git:devel/git
 
 USES=		go:modules
+GO_MODULE=	github.com/git-lfs/git-lfs/v3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
-MANPAGES_BUILD_DEPENDS=	ronn:textproc/rubygem-ronn
+MANPAGES_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor
 
 post-build-MANPAGES-on:
-	cd ${GO_WRKSRC}/docs/man && ${LOCALBASE}/bin/ronn -r *.ronn
+	cd ${GO_WRKSRC}/docs/man && ${LOCALBASE}/bin/asciidoctor -b manpage *.adoc
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${GO_WRKSRC}/docs/man/*.1 ${STAGEDIR}${LOCALBASE}/share/man/man1
 	${INSTALL_MAN} ${GO_WRKSRC}/docs/man/*.5 ${STAGEDIR}${LOCALBASE}/share/man/man5
 
 .include <bsd.port.mk>
diff --git a/devel/git-lfs/distinfo b/devel/git-lfs/distinfo
index 74918667ca03..1c0efc4a4af7 100644
--- a/devel/git-lfs/distinfo
+++ b/devel/git-lfs/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1642406951
-SHA256 (git-lfs-v3.0.2.tar.gz) = 7179a357a0d0e7beaba217489f7f784ca8717035a5e3f1ee91ca7193ba3a35f3
-SIZE (git-lfs-v3.0.2.tar.gz) = 3126121
+TIMESTAMP = 1726132986
+SHA256 (go/devel_git-lfs/git-lfs-v3.5.1/v3.5.1.mod) = 01ddef4da6b890cbfe3429b77581aef6348ac06b6c18a783b741b71dc69837c6
+SIZE (go/devel_git-lfs/git-lfs-v3.5.1/v3.5.1.mod) = 1993
+SHA256 (go/devel_git-lfs/git-lfs-v3.5.1/v3.5.1.zip) = 0e3c996c744d2c1a2e4a4e75f54ddf6947af8cd06f5df70a59edaaa9d1435e71
+SIZE (go/devel_git-lfs/git-lfs-v3.5.1/v3.5.1.zip) = 957873
diff --git a/devel/git-lfs/pkg-message b/devel/git-lfs/pkg-message
index dfeb1778fc63..2c83d1aef0df 100644
--- a/devel/git-lfs/pkg-message
+++ b/devel/git-lfs/pkg-message
@@ -1,28 +1,28 @@
 [
 { type: install
   message: <<EOM
 To get started with Git LFS, the following commands can be used:
 
   1. Setup Git LFS on your system. You only have to do this once per
      repository per machine:
 
      $ git lfs install
 
   2. Choose the type of files you want to track, for examples all ISO
      images, with git lfs track:
 
      $ git lfs track "*.iso"
 
   3. The above stores this information in gitattributes(5) files, so
-     that file need to be added to the repository:
+     that file needs to be added to the repository:
 
      $ git add .gitattributes
 
   4. Commit, push and work with the files normally:
 
      $ git add file.iso
      $ git commit -m "Add disk image"
      $ git push
 EOM
 }
 ]
diff --git a/devel/git-lfs/pkg-plist b/devel/git-lfs/pkg-plist
index 987ca53e52e3..e26cdfba2a98 100644
--- a/devel/git-lfs/pkg-plist
+++ b/devel/git-lfs/pkg-plist
@@ -1,34 +1,36 @@
 bin/git-lfs
 %%MANPAGES%%share/man/man1/git-lfs-checkout.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-clean.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-clone.1.gz
+%%MANPAGES%%share/man/man1/git-lfs-completion.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-dedup.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-env.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-ext.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-fetch.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-filter-process.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-fsck.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-install.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-lock.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-locks.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-logs.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-ls-files.1.gz
+%%MANPAGES%%share/man/man1/git-lfs-merge-driver.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-migrate.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-pointer.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-post-checkout.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-post-commit.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-post-merge.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-pre-push.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-prune.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-pull.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-push.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-smudge.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-standalone-file.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-status.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-track.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-uninstall.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-unlock.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-untrack.1.gz
 %%MANPAGES%%share/man/man1/git-lfs-update.1.gz
 %%MANPAGES%%share/man/man1/git-lfs.1.gz
 %%MANPAGES%%share/man/man5/git-lfs-config.5.gz