diff --git a/textproc/adoc-mode.el/Makefile b/textproc/adoc-mode.el/Makefile
index 7f23b8903f64..58b073287b6b 100644
--- a/textproc/adoc-mode.el/Makefile
+++ b/textproc/adoc-mode.el/Makefile
@@ -1,38 +1,45 @@
 PORTNAME=	adoc-mode.el
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.0
-PORTREVISION=	8
+DISTVERSION=	0.8.0
 CATEGORIES=	textproc elisp
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Major-mode for editing AsciiDoc files in Emacs
 WWW=		https://github.com/bbatsov/adoc-mode
 
 LICENSE=	GPLv2+
 
-USES=		emacs
+USES=		emacs:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	bbatsov
 GH_PROJECT=	adoc-mode
 
 CONFLICTS_INSTALL=	adoc-mode.el-emacs_*
 
 NO_ARCH=	yes
-NO_BUILD=	yes
 
-PLIST_FILES=	${EMACS_SITE_LISPDIR}/adoc-mode.el
+PLIST_FILES=	${EMACS_SITE_LISPDIR}/adoc-mode/adoc-mode-autoloads.el \
+		${EMACS_SITE_LISPDIR}/adoc-mode/adoc-mode-image.el \
+		${EMACS_SITE_LISPDIR}/adoc-mode/adoc-mode-tempo.el \
+		${EMACS_SITE_LISPDIR}/adoc-mode/adoc-mode.el
+
 PORTDOCS=	CHANGELOG.md CONTRIBUTING.md README.adoc
 
 OPTIONS_DEFINE=	DOCS
 
+do-build:
+	${EMACS_CMD} --batch -q --no-site-file \
+		--eval "(make-directory-autoloads \"${WRKSRC}/\" \
+		\"${WRKSRC}/adoc-mode-autoloads.el\")"
+
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/adoc-mode.el* \
-		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/adoc-mode
+	${INSTALL_DATA} ${WRKSRC}/adoc-mode*.el \
+		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/adoc-mode
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:C/^/${WRKSRC}\//} \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/adoc-mode.el/distinfo b/textproc/adoc-mode.el/distinfo
index d4a75d248aca..ba0082e1eb18 100644
--- a/textproc/adoc-mode.el/distinfo
+++ b/textproc/adoc-mode.el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688664384
-SHA256 (bbatsov-adoc-mode-v0.7.0_GH0.tar.gz) = 8a402ed889985bb8289214e83b0c42dc4ff1c3c2a469b925a5b86d553a97cf4a
-SIZE (bbatsov-adoc-mode-v0.7.0_GH0.tar.gz) = 230359
+TIMESTAMP = 1776641344
+SHA256 (bbatsov-adoc-mode-v0.8.0_GH0.tar.gz) = f9a7d535f033359165c78acc494cbcbf9366f8fbb7aa6e4f66fc1f20ab4cd4c9
+SIZE (bbatsov-adoc-mode-v0.8.0_GH0.tar.gz) = 242890