diff --git a/devel/forge-devel/Makefile b/devel/forge-devel/Makefile
index da338e1bd569..2c5d63761aeb 100644
--- a/devel/forge-devel/Makefile
+++ b/devel/forge-devel/Makefile
@@ -1,88 +1,86 @@
 PORTNAME=	forge
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.2-575
-PORTREVISION=	2
-DISTVERSIONSUFFIX=	-gceb6f5b
+DISTVERSION=	0.4.1
+DISTVERSIONSUFFIX=
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Work with Git forges from the comfort of Magit (Development Version)
 WWW=		https://github.com/magit/forge
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	closql-devel${EMACS_PKGNAMESUFFIX}>=1.2.1:databases/closql-devel@${EMACS_FLAVOR} \
-		compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.4:misc/compat.el@${EMACS_FLAVOR} \
+BUILD_DEPENDS=	closql-devel${EMACS_PKGNAMESUFFIX}>=2.0.0:databases/closql-devel@${EMACS_FLAVOR} \
+		compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
-		emacsql-devel${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql-devel@${EMACS_FLAVOR} \
-		ghub-devel${EMACS_PKGNAMESUFFIX}>=3.5.6:devel/ghub-devel@${EMACS_FLAVOR} \
-		magit-devel${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit-devel@${EMACS_FLAVOR} \
-		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
-		transient-devel${EMACS_PKGNAMESUFFIX}>=0.5.3:devel/transient-devel@${EMACS_FLAVOR} \
-		yaml.el${EMACS_PKGNAMESUFFIX}>=0.5.2:textproc/yaml.el@${EMACS_FLAVOR}
-RUN_DEPENDS=	closql-devel${EMACS_PKGNAMESUFFIX}>=1.2.1:databases/closql-devel@${EMACS_FLAVOR} \
-		compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.4:misc/compat.el@${EMACS_FLAVOR} \
+		emacsql-devel${EMACS_PKGNAMESUFFIX}>=4.0.0:databases/emacsql-devel@${EMACS_FLAVOR} \
+		ghub-devel${EMACS_PKGNAMESUFFIX}>=4.0.0:devel/ghub-devel@${EMACS_FLAVOR} \
+		magit-devel${EMACS_PKGNAMESUFFIX}>=4.0.0:devel/magit-devel@${EMACS_FLAVOR} \
+		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.6:textproc/markdown-mode.el@${EMACS_FLAVOR} \
+		transient-devel${EMACS_PKGNAMESUFFIX}>=0.7.4:devel/transient-devel@${EMACS_FLAVOR} \
+		yaml.el${EMACS_PKGNAMESUFFIX}>=0.5.5:textproc/yaml.el@${EMACS_FLAVOR}
+RUN_DEPENDS=	closql-devel${EMACS_PKGNAMESUFFIX}>=2.0.0:databases/closql-devel@${EMACS_FLAVOR} \
+		compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
-		emacsql-devel${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql-devel@${EMACS_FLAVOR} \
-		ghub-devel${EMACS_PKGNAMESUFFIX}>=3.5.6:devel/ghub-devel@${EMACS_FLAVOR} \
-		magit-devel${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit-devel@${EMACS_FLAVOR} \
-		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
-		transient-devel${EMACS_PKGNAMESUFFIX}>=0.5.3:devel/transient-devel@${EMACS_FLAVOR} \
-		yaml.el${EMACS_PKGNAMESUFFIX}>=0.5.2:textproc/yaml.el@${EMACS_FLAVOR}
+		emacsql-devel${EMACS_PKGNAMESUFFIX}>=4.0.0:databases/emacsql-devel@${EMACS_FLAVOR} \
+		ghub-devel${EMACS_PKGNAMESUFFIX}>=4.0.0:devel/ghub-devel@${EMACS_FLAVOR} \
+		magit-devel${EMACS_PKGNAMESUFFIX}>=4.0.0:devel/magit-devel@${EMACS_FLAVOR} \
+		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.6:textproc/markdown-mode.el@${EMACS_FLAVOR} \
+		transient-devel${EMACS_PKGNAMESUFFIX}>=0.7.4:devel/transient-devel@${EMACS_FLAVOR} \
+		yaml.el${EMACS_PKGNAMESUFFIX}>=0.5.5:textproc/yaml.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	INSTALL_INFO=install-info \
 		LOAD_PATH="${LOAD_PATH}"
 # Parallel build fails if Emacs is built with native compilation enabled
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	forge-emacs*
 
 NO_ARCH=	yes
 
 INFO=		forge
 PORTDOCS=	CHANGELOG README.org forge.html
 
 OPTIONS_DEFINE=	DOCS PDF
 OPTIONS_SUB=	yes
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 
-LOAD_PATH=	-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L \
-		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L \
+LOAD_PATH=	-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/closql -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/magit
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 	${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.org \
 		${WRKSRC}/docs/forge.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/forge.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/forge-devel/distinfo b/devel/forge-devel/distinfo
index 7ea47a425d23..2bb6888a2975 100644
--- a/devel/forge-devel/distinfo
+++ b/devel/forge-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717204879
-SHA256 (magit-forge-v0.3.2-575-gceb6f5b_GH0.tar.gz) = a7d815f0856291b2b296109ee4aba2aedb9edb84e4428be78af6c626a7b67171
-SIZE (magit-forge-v0.3.2-575-gceb6f5b_GH0.tar.gz) = 115856
+TIMESTAMP = 1723785093
+SHA256 (magit-forge-v0.4.1_GH0.tar.gz) = f4dc2109d9fa9a7e0b1bfee386a059b8ede875bc94c257d47d2d22b9eb17dcf1
+SIZE (magit-forge-v0.4.1_GH0.tar.gz) = 129874
diff --git a/devel/forge/Makefile b/devel/forge/Makefile
index 9543af9d676c..093af82fb37e 100644
--- a/devel/forge/Makefile
+++ b/devel/forge/Makefile
@@ -1,84 +1,85 @@
 PORTNAME=	forge
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.2
-PORTREVISION=	5
+DISTVERSION=	0.4.1
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Work with Git forges from the comfort of Magit
 WWW=		https://github.com/magit/forge
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.2.0:databases/closql@${EMACS_FLAVOR} \
+BUILD_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=2.0.0:databases/closql@${EMACS_FLAVOR} \
+		compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
-		emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR} \
-		ghub${EMACS_PKGNAMESUFFIX}>=3.5.4:devel/ghub@${EMACS_FLAVOR} \
-		magit${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit@${EMACS_FLAVOR} \
-		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
-		transient${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient@${EMACS_FLAVOR} \
-		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.4:textproc/yaml.el@${EMACS_FLAVOR}
-RUN_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.2.0:databases/closql@${EMACS_FLAVOR} \
+		emacsql${EMACS_PKGNAMESUFFIX}>=4.0.0:databases/emacsql@${EMACS_FLAVOR} \
+		ghub${EMACS_PKGNAMESUFFIX}>=4.0.0:devel/ghub@${EMACS_FLAVOR} \
+		magit${EMACS_PKGNAMESUFFIX}>=4.0.0:devel/magit@${EMACS_FLAVOR} \
+		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.6:textproc/markdown-mode.el@${EMACS_FLAVOR} \
+		transient${EMACS_PKGNAMESUFFIX}>=0.7.4:devel/transient@${EMACS_FLAVOR} \
+		yaml.el${EMACS_PKGNAMESUFFIX}>=0.5.5:textproc/yaml.el@${EMACS_FLAVOR}
+RUN_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=2.0.0:databases/closql@${EMACS_FLAVOR} \
+		compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
-		emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR} \
-		ghub${EMACS_PKGNAMESUFFIX}>=3.5.4:devel/ghub@${EMACS_FLAVOR} \
-		magit${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit@${EMACS_FLAVOR} \
-		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
-		transient${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient@${EMACS_FLAVOR} \
-		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.4:textproc/yaml.el@${EMACS_FLAVOR}
+		emacsql${EMACS_PKGNAMESUFFIX}>=4.0.0:databases/emacsql@${EMACS_FLAVOR} \
+		ghub${EMACS_PKGNAMESUFFIX}>=4.0.0:devel/ghub@${EMACS_FLAVOR} \
+		magit${EMACS_PKGNAMESUFFIX}>=4.0.0:devel/magit@${EMACS_FLAVOR} \
+		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.6:textproc/markdown-mode.el@${EMACS_FLAVOR} \
+		transient${EMACS_PKGNAMESUFFIX}>=0.7.4:devel/transient@${EMACS_FLAVOR} \
+		yaml.el${EMACS_PKGNAMESUFFIX}>=0.5.5:textproc/yaml.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	INSTALL_INFO=install-info \
 		LOAD_PATH="${LOAD_PATH}"
 # Parallel build fails if Emacs is built with native compilation enabled
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	forge-devel*
 
 NO_ARCH=	yes
 
 INFO=		forge
-PORTDOCS=	CHANGELOG README.md forge.html
+PORTDOCS=	CHANGELOG README.org forge.html
 
 OPTIONS_DEFINE=	DOCS PDF
 OPTIONS_SUB=	yes
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 
 LOAD_PATH=	-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L \
-		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/closql -L \
+		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/magit
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 	${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.md \
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.org \
 		${WRKSRC}/docs/forge.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/forge.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/forge/distinfo b/devel/forge/distinfo
index e4444766066d..2bb6888a2975 100644
--- a/devel/forge/distinfo
+++ b/devel/forge/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687917799
-SHA256 (magit-forge-v0.3.2_GH0.tar.gz) = 19b1acff2fe27eb9860617a6e14ccb434e47b37fa2904d752f23bcdc04c4c503
-SIZE (magit-forge-v0.3.2_GH0.tar.gz) = 96975
+TIMESTAMP = 1723785093
+SHA256 (magit-forge-v0.4.1_GH0.tar.gz) = f4dc2109d9fa9a7e0b1bfee386a059b8ede875bc94c257d47d2d22b9eb17dcf1
+SIZE (magit-forge-v0.4.1_GH0.tar.gz) = 129874
diff --git a/devel/forge/pkg-plist b/devel/forge/pkg-plist
index 14bebdd0f4f5..678527951943 100644
--- a/devel/forge/pkg-plist
+++ b/devel/forge/pkg-plist
@@ -1,38 +1,42 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-autoloads.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-bitbucket.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-bitbucket.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-commands.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-commands.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-core.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-core.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-db.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-db.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-gitea.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-gitea.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-github.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-github.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-gitlab.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-gitlab.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-gogs.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-gogs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-issue.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-issue.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-list.el
-%%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-list.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-notify.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-notify.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-post.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-post.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-pullreq.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-pullreq.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-repo.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-repo.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-repos.el
+%%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-repos.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-revnote.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-revnote.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-semi.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-semi.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-tablist.el
+%%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-tablist.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-topic.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-topic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-topics.el
+%%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-topics.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge.elc
 %%PDF%%%%DOCSDIR%%/forge.pdf