diff --git a/sysutils/vimpager/Makefile b/sysutils/vimpager/Makefile
index 26466bb6f799..3cd535016297 100644
--- a/sysutils/vimpager/Makefile
+++ b/sysutils/vimpager/Makefile
@@ -1,32 +1,48 @@
 PORTNAME=	vimpager
-DISTVERSION=	2.06.20200712
-PORTREVISION=	1
+DISTVERSION=	2.06.20250412
 CATEGORIES=	sysutils
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Use Vim/NeoVim as a pager
+MAINTAINER=	nxjoseph@protonmail.com
+COMMENT=	Use Vim/NeoVim as a pager (${FLAVOR:U} flavor)
 WWW=		https://github.com/rkitover/vimpager
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+FLAVORS=	console gtk2 gtk3 motif tiny x11 neovim
+FLAVOR?=	${FLAVORS:[1]}
+
+console_RUN_DEPENDS=	${LOCALBASE}/bin/vim:editors/vim@console
+gtk2_PKGNAMESUFFIX=	-gtk2
+gtk2_RUN_DEPENDS=	${LOCALBASE}/bin/vim:editors/vim@gtk2
+gtk3_PKGNAMESUFFIX=	-gtk3
+gtk3_RUN_DEPENDS=	${LOCALBASE}/bin/vim:editors/vim@gtk3
+motif_PKGNAMESUFFIX=	-motif
+motif_RUN_DEPENDS=	${LOCALBASE}/bin/vim:editors/vim@motif
+neovim_PKGNAMESUFFIX=	-neovim
+neovim_RUN_DEPENDS=	${LOCALBASE}/bin/nvim:editors/neovim
+tiny_PKGNAMESUFFIX=	-tiny
+tiny_RUN_DEPENDS=	${LOCALBASE}/bin/vim:editors/vim@tiny
+x11_PKGNAMESUFFIX=	-x11
+x11_RUN_DEPENDS=	${LOCALBASE}/bin/vim:editors/vim@x11
+
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	rkitover
-GH_TAGNAME=	85004fd
+GH_TAGNAME=	842f746
 
-NO_ARCH=	yes
+TEST_TARGET=	test
+TESTING_UNSAFE=	yes
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_SINGLE=	BACKEND
-OPTIONS_DEFAULT=VIM
+# Register conflicts with all other flavors
+CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:S/^/vimpager-/}
+
+NO_ARCH=	yes
 
-OPTIONS_SINGLE_BACKEND=	NEOVIM VIM
-BACKEND_DESC=	Choose your Vim backend
-NEOVIM_DESC=	NeoVim
-VIM_DESC=	Vim
+OPTIONS_DEFINE=	DOCS TEST
+OPTIONS_SUB=	yes
 
-NEOVIM_RUN_DEPENDS=	nvim:editors/neovim
-VIM_RUN_DEPENDS=	vim:editors/vim
+DOCS_BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
+TEST_RUN_DEPENDS=	bats:devel/bats-core
 
 .include <bsd.port.mk>
diff --git a/sysutils/vimpager/distinfo b/sysutils/vimpager/distinfo
index 3be032fd4ec6..1b68ff67dcf5 100644
--- a/sysutils/vimpager/distinfo
+++ b/sysutils/vimpager/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594537103
-SHA256 (rkitover-vimpager-2.06.20200712-85004fd_GH0.tar.gz) = 7bf5f4b7ac6ef0bfc2d7837ce4a4bab9d891ddd14739e0619ba3346e75c3fb4d
-SIZE (rkitover-vimpager-2.06.20200712-85004fd_GH0.tar.gz) = 164077
+TIMESTAMP = 1748713928
+SHA256 (rkitover-vimpager-2.06.20250412-842f746_GH0.tar.gz) = 935c6e80e3c66fba31ba6f1d7fb2f3f471599f21848c1b6b5063ccd7dd5374c5
+SIZE (rkitover-vimpager-2.06.20250412-842f746_GH0.tar.gz) = 164299
diff --git a/sysutils/vimpager/pkg-plist b/sysutils/vimpager/pkg-plist
index 0f3267375a4a..0ff111dfc741 100644
--- a/sysutils/vimpager/pkg-plist
+++ b/sysutils/vimpager/pkg-plist
@@ -1,20 +1,24 @@
 bin/vimcat
 bin/vimpager
-etc/vimpagerrc
+%%ETCDIR%%rc
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog_vimcat.yml
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog_vimpager.yml
 %%PORTDOCS%%%%DOCSDIR%%/DOC_AUTHORS.yml
 %%PORTDOCS%%%%DOCSDIR%%/TODO.yml
 %%PORTDOCS%%%%DOCSDIR%%/copyright
+%%PORTDOCS%%%%DOCSDIR%%/html/vimcat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vimpager.html
 %%PORTDOCS%%%%DOCSDIR%%/uganda.txt
 %%PORTDOCS%%%%DOCSDIR%%/vimcat.md
 %%PORTDOCS%%%%DOCSDIR%%/vimpager.md
+share/man/man1/vimcat.1.gz
+share/man/man1/vimpager.1.gz
 %%DATADIR%%/autoload/AnsiEsc.vim
 %%DATADIR%%/autoload/vimcat.vim
 %%DATADIR%%/autoload/vimpager.vim
 %%DATADIR%%/autoload/vimpager_utils.vim
 %%DATADIR%%/macros/less.vim
 %%DATADIR%%/plugin/AnsiEscPlugin.vim
 %%DATADIR%%/plugin/cecutil.vim
 %%DATADIR%%/plugin/vimpager.vim
 %%DATADIR%%/syntax/perldoc.vim