diff --git a/devel/cl-alexandria/Makefile b/devel/cl-alexandria/Makefile
index 6b64a305de05..e909e32c2d16 100644
--- a/devel/cl-alexandria/Makefile
+++ b/devel/cl-alexandria/Makefile
@@ -1,52 +1,65 @@
 PORTNAME=	alexandria
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Collection of portable public domain utilities for Common Lisp
 WWW=		https://common-lisp.net/project/alexandria/
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 USES=		cl
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.common-lisp.net
 
 PORTSCOUT=	limit:^1\.
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS PDF
 
-DOCS_BUILD_DEPENDS=	sbcl:lang/sbcl \
-			texi2pdf:print/texinfo
-DOCS_USES=		tex
-DOCS_USE=		TEX=latex:build
-DOCS_INFO=		doc/${PORTNAME}
+PDF_DESC=	Build and install PDF documentation
+
+DOCS_BUILD_DEPENDS=	sbcl:lang/sbcl
+DOCS_USES=		makeinfo
+DOCS_INFO=		${PORTNAME}
+
+PDF_IMPLIES=		DOCS
+PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
+PDF_USES=		tex
+PDF_USE=		TEX=dvipdfmx:build
+PDF_PLIST_FILES=	${DOCSDIR}/${PORTNAME}.pdf
 
 do-build:
 	@${DO_NADA}
 
 do-build-DOCS-on:
-	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} doc
+	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} html info
+
+do-build-PDF-on:
+	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} pdf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}-1 \
 		${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}-2 \
 		${STAGEDIR}${ASDF_REGISTRY}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-1/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}-1
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-2/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}-2
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.asd ${STAGEDIR}${ASDF_PATHNAME}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-tests.asd ${STAGEDIR}${ASDF_PATHNAME}
 	${RLN} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}.asd ${STAGEDIR}${ASDF_REGISTRY}
 	${RLN} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}-tests.asd ${STAGEDIR}${ASDF_REGISTRY}
 
 do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${PREFIX}/${INFO_PATH}
+	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.html ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
+
+do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.html ${WRKSRC}/doc/${PORTNAME}.pdf \
-		${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/cl-alexandria/pkg-plist b/devel/cl-alexandria/pkg-plist
index bb67a132f354..e786da65d404 100644
--- a/devel/cl-alexandria/pkg-plist
+++ b/devel/cl-alexandria/pkg-plist
@@ -1,30 +1,29 @@
 lib/common-lisp/alexandria/alexandria-1/arrays.lisp
 lib/common-lisp/alexandria/alexandria-1/binding.lisp
 lib/common-lisp/alexandria/alexandria-1/conditions.lisp
 lib/common-lisp/alexandria/alexandria-1/control-flow.lisp
 lib/common-lisp/alexandria/alexandria-1/definitions.lisp
 lib/common-lisp/alexandria/alexandria-1/features.lisp
 lib/common-lisp/alexandria/alexandria-1/functions.lisp
 lib/common-lisp/alexandria/alexandria-1/hash-tables.lisp
 lib/common-lisp/alexandria/alexandria-1/io.lisp
 lib/common-lisp/alexandria/alexandria-1/lists.lisp
 lib/common-lisp/alexandria/alexandria-1/macros.lisp
 lib/common-lisp/alexandria/alexandria-1/numbers.lisp
 lib/common-lisp/alexandria/alexandria-1/package.lisp
 lib/common-lisp/alexandria/alexandria-1/sequences.lisp
 lib/common-lisp/alexandria/alexandria-1/strings.lisp
 lib/common-lisp/alexandria/alexandria-1/symbols.lisp
 lib/common-lisp/alexandria/alexandria-1/tests.lisp
 lib/common-lisp/alexandria/alexandria-1/types.lisp
 lib/common-lisp/alexandria/alexandria-2/arrays.lisp
 lib/common-lisp/alexandria/alexandria-2/control-flow.lisp
 lib/common-lisp/alexandria/alexandria-2/lists.lisp
 lib/common-lisp/alexandria/alexandria-2/package.lisp
 lib/common-lisp/alexandria/alexandria-2/sequences.lisp
 lib/common-lisp/alexandria/alexandria-2/tests.lisp
 lib/common-lisp/alexandria/alexandria-tests.asd
 lib/common-lisp/alexandria/alexandria.asd
 lib/common-lisp/system-registry/alexandria-tests.asd
 lib/common-lisp/system-registry/alexandria.asd
 %%PORTDOCS%%%%DOCSDIR%%/alexandria.html
-%%PORTDOCS%%%%DOCSDIR%%/alexandria.pdf