diff --git a/devel/catch/Makefile b/devel/catch/Makefile
index a532f4987f77..df4f7b4f3cea 100644
--- a/devel/catch/Makefile
+++ b/devel/catch/Makefile
@@ -1,30 +1,29 @@
 PORTNAME=	catch
 PORTVERSION=	2.13.10
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Header-only test framework for C++
 WWW=		https://github.com/catchorg/Catch2
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cmake compiler:c++14-lang pathfix python:build
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	catchorg
 GH_PROJECT=	Catch2
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_DOCDIR=${DOCSDIR}
-PORTDOCS=	*
-
 NO_ARCH=	yes
 
 PORTSCOUT=	limit:^2\.
 
 OPTIONS_DEFINE=	DOCS
 
 do-test:
 	${BUILD_WRKSRC}/projects/SelfTest
 
 .include <bsd.port.mk>
diff --git a/devel/catch/pkg-plist b/devel/catch/pkg-plist
index a5d29439d3f4..0b5f0d241ef9 100644
--- a/devel/catch/pkg-plist
+++ b/devel/catch/pkg-plist
@@ -1,14 +1,42 @@
 include/catch2/catch.hpp
 include/catch2/catch_reporter_automake.hpp
 include/catch2/catch_reporter_sonarqube.hpp
 include/catch2/catch_reporter_tap.hpp
 include/catch2/catch_reporter_teamcity.hpp
 lib/cmake/Catch2/Catch.cmake
 lib/cmake/Catch2/Catch2Config.cmake
 lib/cmake/Catch2/Catch2ConfigVersion.cmake
 lib/cmake/Catch2/Catch2Targets.cmake
 lib/cmake/Catch2/CatchAddTests.cmake
 lib/cmake/Catch2/ParseAndAddCatchTests.cmake
 libdata/pkgconfig/catch2.pc
 share/Catch2/gdbinit
 share/Catch2/lldbinit
+%%PORTDOCS%%%%DOCSDIR%%/Readme.md
+%%PORTDOCS%%%%DOCSDIR%%/assertions.md
+%%PORTDOCS%%%%DOCSDIR%%/benchmarks.md
+%%PORTDOCS%%%%DOCSDIR%%/ci-and-misc.md
+%%PORTDOCS%%%%DOCSDIR%%/cmake-integration.md
+%%PORTDOCS%%%%DOCSDIR%%/command-line.md
+%%PORTDOCS%%%%DOCSDIR%%/commercial-users.md
+%%PORTDOCS%%%%DOCSDIR%%/configuration.md
+%%PORTDOCS%%%%DOCSDIR%%/contributing.md
+%%PORTDOCS%%%%DOCSDIR%%/deprecations.md
+%%PORTDOCS%%%%DOCSDIR%%/event-listeners.md
+%%PORTDOCS%%%%DOCSDIR%%/generators.md
+%%PORTDOCS%%%%DOCSDIR%%/limitations.md
+%%PORTDOCS%%%%DOCSDIR%%/list-of-examples.md
+%%PORTDOCS%%%%DOCSDIR%%/logging.md
+%%PORTDOCS%%%%DOCSDIR%%/matchers.md
+%%PORTDOCS%%%%DOCSDIR%%/opensource-users.md
+%%PORTDOCS%%%%DOCSDIR%%/other-macros.md
+%%PORTDOCS%%%%DOCSDIR%%/own-main.md
+%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes.md
+%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-process.md
+%%PORTDOCS%%%%DOCSDIR%%/reporters.md
+%%PORTDOCS%%%%DOCSDIR%%/slow-compiles.md
+%%PORTDOCS%%%%DOCSDIR%%/test-cases-and-sections.md
+%%PORTDOCS%%%%DOCSDIR%%/test-fixtures.md
+%%PORTDOCS%%%%DOCSDIR%%/tostring.md
+%%PORTDOCS%%%%DOCSDIR%%/tutorial.md
+%%PORTDOCS%%%%DOCSDIR%%/why-catch.md