diff --git a/sysutils/flashrom/Makefile b/sysutils/flashrom/Makefile
index a5acb750e55a..ccc9e29dbb4f 100644
--- a/sysutils/flashrom/Makefile
+++ b/sysutils/flashrom/Makefile
@@ -1,46 +1,52 @@
 PORTNAME=	flashrom
 PORTVERSION=	1.6.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://download.flashrom.org/releases/
 
 MAINTAINER=	mizhka@FreeBSD.org
 COMMENT=	Utility for reading, writing, verifying, and erasing flash ROM chips
 WWW=		https://www.flashrom.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NOT_FOR_ARCHS=	riscv64
 NOT_FOR_ARCHS_REASON=	Unable to determine endianness.
 
-BUILD_DEPENDS+=	cmocka>=0:sysutils/cmocka \
-		sphinx-build:textproc/py-sphinx
+BUILD_DEPENDS=	cmocka>=0:sysutils/cmocka
 LIB_DEPENDS=	libpci.so:devel/libpci
 
-USES=		meson pkgconfig tar:xz
+USES=		meson pkgconfig ssl tar:xz
+USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE= DOCS FTDI
+OPTIONS_DEFINE=		DOCS FTDI MANPAGES
 OPTIONS_DEFINE_amd64=	DMIDECODE
 OPTIONS_DEFINE_i386=	DMIDECODE
+OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_DEFAULT_amd64=	DMIDECODE
 OPTIONS_DEFAULT_i386=	DMIDECODE
+OPTIONS_SUB=		yes
 
 DMIDECODE_DESC=	Use dmidecode to gather DMI information
 FTDI_DESC=	Enable external FT2232SPI flasher support
 
 DMIDECODE_RUN_DEPENDS=	dmidecode:sysutils/dmidecode
 
-DOCS_MESON_ENABLED=	documentation man-pages
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+DOCS_MESON_ENABLED=	documentation
 DOCS_MESON_DISABLED=	generate_authors_list
 
 FTDI_LIB_DEPENDS=	libftdi1.so:devel/libftdi1
 
-post-install:
+MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+MANPAGES_MESON_ENABLED=	man-pages
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}
-#	cd ${WRKSRC}/Documentation && ${INSTALL_DATA} *.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/flashrom/pkg-plist b/sysutils/flashrom/pkg-plist
index b03eaeb8c17f..5d711ef10199 100644
--- a/sysutils/flashrom/pkg-plist
+++ b/sysutils/flashrom/pkg-plist
@@ -1,8 +1,9 @@
 include/libflashrom.h
 lib/libflashrom.a
 lib/libflashrom.so
 lib/libflashrom.so.1
 lib/libflashrom.so.1.0.0
 libdata/pkgconfig/flashrom.pc
-share/man/man8/flashrom.8.gz
 sbin/flashrom
+share/bash-completion/completions/flashrom.bash
+%%MANPAGES%%share/man/man8/flashrom.8.gz