diff --git a/www/restinio/Makefile b/www/restinio/Makefile
index 9ed2e42a0bd4..39cae9c3523c 100644
--- a/www/restinio/Makefile
+++ b/www/restinio/Makefile
@@ -1,46 +1,56 @@
 PORTNAME=	restinio
-DISTVERSIONPREFIX=	v.
 DISTVERSION=	0.6.17
+PORTREVISION=	1
 CATEGORIES=	www devel
+MASTER_SITES=	https://github.com/Stiffstream/${PORTNAME}/releases/download/v.${DISTVERSION}/
+DISTNAME=	${PORTNAME}-${DISTVERSION}-full
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Asynchronous HTTP/WebSocket server C++14 library
 WWW=		https://stiffstream.com/en/products/restinio.html
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-BUILD_DEPENDS=	asio>0:net/asio \
-		libfmt>0:devel/libfmt \
+BUILD_DEPENDS=	libfmt>0:devel/libfmt \
 		sobjectizer>0:devel/sobjectizer
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libhttp_parser.so:www/http-parser \
 		libpcre2-8.so:devel/pcre2
-RUN_DEPENDS=	asio>0:net/asio \
-		libfmt>0:devel/libfmt \
+RUN_DEPENDS=	libfmt>0:devel/libfmt \
 		sobjectizer>0:devel/sobjectizer
 
-USES=		cmake:testing compiler:c++14-lang localbase:ldflags
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	Stiffstream
-GH_TUPLE=	catchorg:Clara:2bfd8b2:clara
+USES=		cmake:testing compiler:c++14-lang localbase:ldflags tar:bz2
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 WRKSRC_SUBDIR=	dev
 
-CXXFLAGS+=	-I${WRKSRC_clara}/include
-
+CMAKE_ARGS=		-DRESTINIO_USE_BOOST_ASIO=shared
 CMAKE_ON=		RESTINIO_FIND_DEPS RESTINIO_USE_EXTERNAL_HTTP_PARSER RESTINIO_USE_EXTERNAL_SOBJECTIZER
 CMAKE_OFF=		RESTINIO_BENCH RESTINIO_INSTALL_BENCHES RESTINIO_TEST
 CMAKE_TESTING_ON=	RESTINIO_TEST
 
 OPTIONS_DEFINE=		SAMPLES
 OPTIONS_SUB=		yes
 
 SAMPLES_DESC=		Build and install samples
 SAMPLES_USES=		ssl
+SAMPLES_CXXFLAGS+=	-I${WRKSRC}/clara
 SAMPLES_CMAKE_BOOL=	RESTINIO_SAMPLE RESTINIO_INSTALL_SAMPLES
 SAMPLES_VARS_OFF=	NO_ARCH=yes
 SAMPLES_BUILD_DEPENDS=	json-dto>0:devel/json-dto
 
+post-extract:
+	${RM} -rf ${WRKSRC}/asio
+	${RM} -rf ${WRKSRC}/asio_mxxru
+	${RM} -rf ${WRKSRC}/catch2
+	${RM} -rf ${WRKSRC}/fmt
+	${RM} -rf ${WRKSRC}/fmt_mxxru
+	${RM} -rf ${WRKSRC}/nodejs/http_parser/http-parser.*
+	${RM} -rf ${WRKSRC}/nodejs/http_parser_mxxru
+	${RM} -rf ${WRKSRC}/rapidjson
+	${RM} -rf ${WRKSRC}/rapidjson_mxxru
+	${RM} -rf ${WRKSRC}/so_5
+	${RM} -rf ${WRKSRC}/timertt
+
 .include <bsd.port.mk>
diff --git a/www/restinio/distinfo b/www/restinio/distinfo
index 9207c77d6ee6..521b0d30f629 100644
--- a/www/restinio/distinfo
+++ b/www/restinio/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1667716405
-SHA256 (Stiffstream-restinio-v.0.6.17_GH0.tar.gz) = 0140b23f50bb964f6917d1f99205476eba92203dc586673bdf2ea48d7406f2c4
-SIZE (Stiffstream-restinio-v.0.6.17_GH0.tar.gz) = 670089
-SHA256 (catchorg-Clara-2bfd8b2_GH0.tar.gz) = 679332a04a59d13517a6f56a14b70125a157e6cc7c49bb530b52521c38eef41d
-SIZE (catchorg-Clara-2bfd8b2_GH0.tar.gz) = 128573
+TIMESTAMP = 1667740384
+SHA256 (restinio-0.6.17-full.tar.bz2) = 0821074f91b51582fd149618ae77fe639e8510de6940e1643d222fa8a8dcf553
+SIZE (restinio-0.6.17-full.tar.bz2) = 1697206