diff --git a/devel/forge/Makefile b/devel/forge/Makefile
index 0630c5f16fc4..3309d854164e 100644
--- a/devel/forge/Makefile
+++ b/devel/forge/Makefile
@@ -1,64 +1,82 @@
 PORTNAME=	forge
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Work with Git forges from the comfort of Magit
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.2.0:databases/closql@${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} \
 		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}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	INSTALL_INFO=install-info \
-		LOAD_PATH="${_LOAD_PATH}"
+		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-devel*
 
+NO_ARCH=	yes
+
 INFO=		forge
-PORTDOCS=	CHANGELOG README.md
+PORTDOCS=	CHANGELOG README.md forge.html
+
+OPTIONS_DEFINE=	DOCS PDF
+OPTIONS_SUB=	yes
+
+PDF_DESC=	Build and install PDF document
 
-OPTIONS_DEFINE=	DOCS
+DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
+DOCS_ALL_TARGET=	html
+DOCS_BINARY_ALIAS=	sed=gsed
+PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
+PDF_USE=		TEX=dvipdfmx:build
+PDF_ALL_TARGET=		pdf
 
-_LOAD_PATH=	-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L \
+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} ${PORTDOCS:C/^/${WRKSRC}\//} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.md \
+		${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/pkg-plist b/devel/forge/pkg-plist
index 1158b77cdf44..14bebdd0f4f5 100644
--- a/devel/forge/pkg-plist
+++ b/devel/forge/pkg-plist
@@ -1,37 +1,38 @@
 %%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-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-topic.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge-topic.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge.el
 %%EMACS_VERSION_SITE_LISPDIR%%/forge/forge.elc
+%%PDF%%%%DOCSDIR%%/forge.pdf