diff --git a/devel/rttr/Makefile b/devel/rttr/Makefile
index 064733cf31d3..e0634c06c295 100644
--- a/devel/rttr/Makefile
+++ b/devel/rttr/Makefile
@@ -1,35 +1,34 @@
 PORTNAME=	rttr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.6-16
-PORTREVISION=	3
 DISTVERSIONSUFFIX=	-gb3a131c
+PORTREVISION=	3
 CATEGORIES=	devel
 
 PATCH_SITES=	https://github.com/rttrorg/rttr/commit/
 PATCHFILES=	992df30caa14fe6bfcd2c38213314622e1e02aae.patch:-p1
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Run Time Type Reflection
 WWW=		https://github.com/rttrorg/rttr
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson \
 		${LOCALBASE}/include/chaiscript/chaiscript.hpp:lang/chaiscript
 
 USES=		cmake compiler:c++17-lang pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	rttrorg
 
 CMAKE_OFF=	BUILD_DOCUMENTATION \
 		BUILD_UNIT_TESTS \
 		BUILD_EXAMPLES
 
-PORTSCOUT=	limit:^0\.
+EXTRACT_AFTER_ARGS=	--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/3rd_party/chaiscript-* \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/3rd_party/rapidjson-* \
+			--no-same-owner --no-same-permissions
 
-post-extract:
-	${RM} -r ${WRKSRC}/3rd_party/rapidjson-1.1.0/
-	${RM} -r ${WRKSRC}/3rd_party/chaiscript-devel/
-	${RM} -r ${WRKSRC}/3rd_party/chaiscript-6.1.0/
+PORTSCOUT=	limit:^0\.
 
 .include <bsd.port.mk>