diff --git a/net-p2p/tremotesf/Makefile b/net-p2p/tremotesf/Makefile
index 1059cd7628c0..51d7bbf6299d 100644
--- a/net-p2p/tremotesf/Makefile
+++ b/net-p2p/tremotesf/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	tremotesf
 DISTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 
 MAINTAINER=	vsasjason@gmail.com
 COMMENT=	Remote GUI for transmission-daemon
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
 
 BUILD_DEPENDS=	cxxopts>0:devel/cxxopts
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libpsl.so:dns/libpsl
 
-USES=		cmake desktop-file-utils gettext-tools kde:5 pkgconfig qt:5 xorg
+USES=		cmake:testing desktop-file-utils gettext-tools kde:5 pkgconfig \
+		qt:5 xorg
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	equeim
-GH_PROJECT=	tremotesf2 libtremotesf:lib
-GH_SUBDIR=	src/libtremotesf:lib
-GH_TAGNAME=	2756631:lib
+GH_ACCOUNT=	equeim yhirose:httplib
+GH_PROJECT=	tremotesf2 libtremotesf:lib cpp-httplib:httplib
+GH_SUBDIR=	src/libtremotesf:lib \
+		src/libtremotesf/3rdparty/cpp-httplib:httplib
+GH_TAGNAME=	27566318386b27d75f3ecbee3f91aa02e7da4460:lib v0.12.6:httplib
 
 USE_KDE=	widgetsaddons windowsystem
 
-USE_QT=		concurrent core buildtools:build dbus gui linguisttools:build \
-		network qmake:build widgets
+USE_QT=		core dbus gui network widgets buildtools:build concurrent:build \
+		linguisttools:build qmake:build testlib:build
 
 USE_XORG=	x11
 
-CMAKE_OFF=	BUILD_TESTING
-
 .include <bsd.port.mk>
diff --git a/net-p2p/tremotesf/distinfo b/net-p2p/tremotesf/distinfo
index 5340779f8a60..3b7242fe1199 100644
--- a/net-p2p/tremotesf/distinfo
+++ b/net-p2p/tremotesf/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1696254251
+TIMESTAMP = 1696674248
 SHA256 (equeim-tremotesf2-2.4.0_GH0.tar.gz) = ad5b2a1eeccfdcd275e2ec2bb0f2f355c78f2500f50d22adfce064bd42a3fb75
 SIZE (equeim-tremotesf2-2.4.0_GH0.tar.gz) = 364704
-SHA256 (equeim-libtremotesf-2756631_GH0.tar.gz) = 15793adce05fd9798396bff069a829205f1738e9df4916a92e2f700d6a24ad2e
-SIZE (equeim-libtremotesf-2756631_GH0.tar.gz) = 76187
+SHA256 (yhirose-cpp-httplib-v0.12.6_GH0.tar.gz) = 24bc594a9efcc08a5a6f3928e848d046d411a88b07bcd6f7f3851227a1f0133e
+SIZE (yhirose-cpp-httplib-v0.12.6_GH0.tar.gz) = 641145
+SHA256 (equeim-libtremotesf-27566318386b27d75f3ecbee3f91aa02e7da4460_GH0.tar.gz) = eccd698d7243d034ca4ba68fae924c486b6b0c4e709b079abb423acd774a1979
+SIZE (equeim-libtremotesf-27566318386b27d75f3ecbee3f91aa02e7da4460_GH0.tar.gz) = 76249