diff --git a/devel/json-dto/Makefile b/devel/json-dto/Makefile
index d68b22345143..5a0af9e82849 100644
--- a/devel/json-dto/Makefile
+++ b/devel/json-dto/Makefile
@@ -1,36 +1,39 @@
 PORTNAME=	json-dto
-DISTVERSIONPREFIX=	v.
 DISTVERSION=	0.3.1
 CATEGORIES=	devel textproc
+MASTER_SITES=	https://github.com/Stiffstream/json_dto/releases/download/v.${DISTVERSION}/
+DISTNAME=	json_dto-${DISTVERSION}-full
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Header-only library for converting data between JSON and C++ structs
 WWW=		https://github.com/Stiffstream/json_dto
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	catch>0:devel/catch \
 		rapidjson>0:devel/rapidjson
 RUN_DEPENDS=	rapidjson>0:devel/rapidjson
 
-USES=		cmake:testing compiler:c++14-lang localbase
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	Stiffstream
-GH_PROJECT=	json_dto
+USES=		cmake:testing compiler:c++14-lang localbase tar:bz2
 
+WRKSRC=		${WRKDIR}/json_dto-${DISTVERSION}
 WRKSRC_SUBDIR=	dev
 
 CMAKE_OFF=	JSON_DTO_TEST JSON_DTO_SAMPLE
 CMAKE_TESTING_ON=	JSON_DTO_TEST
 
 NO_ARCH=	yes
 
 PLIST_FILES=	include/json_dto/pub.hpp \
 		include/json_dto/validators.hpp \
 		lib/cmake/json-dto/json-dto-config-version.cmake \
 		lib/cmake/json-dto/json-dto-config.cmake \
 		lib/cmake/json-dto/json-dto-targets.cmake
 
+post-extract:
+		${RM} -rf ${WRKSRC}/catch2
+		${RM} -rf ${WRKSRC}/rapidjson
+		${RM} -rf ${WRKSRC}/rapidjson_mxxru
+
 .include <bsd.port.mk>
diff --git a/devel/json-dto/distinfo b/devel/json-dto/distinfo
index e707abaa2389..20df096c7b04 100644
--- a/devel/json-dto/distinfo
+++ b/devel/json-dto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667715319
-SHA256 (Stiffstream-json_dto-v.0.3.1_GH0.tar.gz) = 515a2d1510d3d8f8b240eb2149f44aeb47a70d26a7071609cca45c0ee198d1d1
-SIZE (Stiffstream-json_dto-v.0.3.1_GH0.tar.gz) = 67641
+TIMESTAMP = 1667739328
+SHA256 (json_dto-0.3.1-full.tar.bz2) = 8e4f122b870e1db2dfa63afa2786fffc9223df481ae05d0db412d532d084d679
+SIZE (json_dto-0.3.1-full.tar.bz2) = 227374