diff --git a/devel/forge-devel/Makefile b/devel/forge-devel/Makefile
index 1aff789a8c93..22c952d36af2 100644
--- a/devel/forge-devel/Makefile
+++ b/devel/forge-devel/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	forge
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.1-14
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-g93c8005
+DISTVERSION=	0.2.1-35
+DISTVERSIONSUFFIX=	-g6738256
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Work with Git forges from the comfort of Magit (Development Version)
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.0.6:databases/closql@${EMACS_FLAVOR} \
 		ghub${EMACS_PKGNAMESUFFIX}>=3.5.2:devel/ghub@${EMACS_FLAVOR} \
 		magit-devel${EMACS_PKGNAMESUFFIX}>=3.0.0:devel/magit-devel@${EMACS_FLAVOR} \
 		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.3:textproc/markdown-mode.el@${EMACS_FLAVOR} \
 		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.3:textproc/yaml.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.0.6:databases/closql@${EMACS_FLAVOR} \
 		ghub${EMACS_PKGNAMESUFFIX}>=3.5.2:devel/ghub@${EMACS_FLAVOR} \
 		magit-devel${EMACS_PKGNAMESUFFIX}>=3.0.0:devel/magit-devel@${EMACS_FLAVOR} \
 		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.3:textproc/markdown-mode.el@${EMACS_FLAVOR} \
 		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.3: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=	forge-emacs*
 
 INFO=		forge
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 _LOAD_PATH=	-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/closql -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}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/forge-devel/distinfo b/devel/forge-devel/distinfo
index 12649e7a0243..e6ba6ee04131 100644
--- a/devel/forge-devel/distinfo
+++ b/devel/forge-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628968519
-SHA256 (magit-forge-v0.2.1-14-g93c8005_GH0.tar.gz) = 7c43720335bd76abaa6fb451a470d0a559e9df4fd1748c64621e3aca075c6e7d
-SIZE (magit-forge-v0.2.1-14-g93c8005_GH0.tar.gz) = 90153
+TIMESTAMP = 1633136819
+SHA256 (magit-forge-v0.2.1-35-g6738256_GH0.tar.gz) = e33994eb828b57cd0fb85df77dcc4e6af6fbf244f94aeac0d153a6b29945da22
+SIZE (magit-forge-v0.2.1-35-g6738256_GH0.tar.gz) = 90852