diff --git a/net-im/tdlib/Makefile b/net-im/tdlib/Makefile
index 814798dc13db..6a8787937e26 100644
--- a/net-im/tdlib/Makefile
+++ b/net-im/tdlib/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	tdlib
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.0-747
-DISTVERSIONSUFFIX=	-gb342ec33
+DISTVERSION=	1.7.4.20210520 # 1.7.4 is not tagged, just set in CMakeLists.txt
 CATEGORIES=	net-im devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for building Telegram clients
 
 LICENSE=	BSL
 
-USES=		cmake compiler:c++14-lang gperf ssl
+USES=		cmake:testing compiler:c++14-lang gperf ssl
 
 USE_GITHUB=	yes
 GH_PROJECT=	td
+GH_TAGNAME=	e1ebf74
 
-CMAKE_OFF=	FREEBSD_BUILD_TESTING
+CMAKE_OFF=	BUILD_TESTING FREEBSD_BUILD_BENCHMARKS
 
-do-test:
+xdo-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFREEBSD_BUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/net-im/tdlib/distinfo b/net-im/tdlib/distinfo
index 1ed7a93f6497..ff2fcb1967d7 100644
--- a/net-im/tdlib/distinfo
+++ b/net-im/tdlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620336229
-SHA256 (tdlib-td-v1.7.0-747-gb342ec33_GH0.tar.gz) = e9feb347f0aaa75cdc0f940663623f330eecad0029b411016ffa3713775359cc
-SIZE (tdlib-td-v1.7.0-747-gb342ec33_GH0.tar.gz) = 4399729
+TIMESTAMP = 1624391403
+SHA256 (tdlib-td-v1.7.4.20210520-e1ebf74_GH0.tar.gz) = f92633b2fbcc5a76166bd730da9d870ddbbe159cd3294c009c33cbd86dc674f5
+SIZE (tdlib-td-v1.7.4.20210520-e1ebf74_GH0.tar.gz) = 4402224
diff --git a/net-im/tdlib/files/patch-CMakeLists.txt b/net-im/tdlib/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..fa81fa16eb1a
--- /dev/null
+++ b/net-im/tdlib/files/patch-CMakeLists.txt
@@ -0,0 +1,17 @@
+- make tests and benchmarks conditional on special cmake variables, see https://github.com/tdlib/td/issues/1583
+
+--- CMakeLists.txt.orig	2021-05-20 23:05:03 UTC
++++ CMakeLists.txt
+@@ -189,9 +189,11 @@ add_subdirectory(sqlite)
+ 
+ add_subdirectory(tddb)
+ 
++if (BUILD_TESTING)
+ add_subdirectory(test)
++endif()
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (FREEBSD_BUILD_BENCHMARKS AND NOT CMAKE_CROSSCOMPILING)
+   add_subdirectory(benchmark)
+ endif()
+