diff --git a/sysutils/synergy-1/Makefile b/sysutils/synergy-1/Makefile
index 7533be7f1273..a82f0c2d6d13 100644
--- a/sysutils/synergy-1/Makefile
+++ b/sysutils/synergy-1/Makefile
@@ -2,13 +2,10 @@
 
 PORTNAME=	synergy-1
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.11.1
+DISTVERSION=	1.12.0
 DISTVERSIONSUFFIX=	-stable
 CATEGORIES=	sysutils
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	e4a2b0f95cd3a18b9772b3282fdd91561956e5e3.patch:-p1 # https://github.com/symless/synergy-core/pull/6649/
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Mouse and keyboard sharing utility
 
@@ -24,9 +21,12 @@ GH_ACCOUNT=	symless
 GH_PROJECT=	synergy-core
 USE_XORG=	ice xtst x11 sm xext xinerama xrandr xi
 
+GH_TUPLE=	google:googletest:2fe3bd994b3189899d93f1d5a881e725e046fdc2:google_googletest/ext/googletest # should not be needed: https://github.com/symless/synergy-core/issues/6787
+
+
 CONFLICTS=	synergy
 
-CMAKE_OFF=	SYNERGY_BUILD_LEGACY_INSTALLER SYNERGY_BUILD_LEGACY_GUI
+CMAKE_OFF=	BUILD_TESTS SYNERGY_BUILD_LEGACY_INSTALLER SYNERGY_BUILD_LEGACY_GUI
 CMAKE_ARGS=	-DSYNERGY_REVISION:STRING=${DISTVERSION:S/.//g}0000 # it expects a 7-digit hash
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/sysutils/synergy-1/distinfo b/sysutils/synergy-1/distinfo
index 503f9b9c6328..ba17623016fe 100644
--- a/sysutils/synergy-1/distinfo
+++ b/sysutils/synergy-1/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1584896801
-SHA256 (symless-synergy-core-v1.11.1-stable_GH0.tar.gz) = 338e5fda0323f8c24259d8fc26e513bdc4f0f249bf66e9722953bb8e6311f88b
-SIZE (symless-synergy-core-v1.11.1-stable_GH0.tar.gz) = 7556850
-SHA256 (e4a2b0f95cd3a18b9772b3282fdd91561956e5e3.patch) = bd6343cf732e643c7241dca95e56e48ea32fec64d673519aff077bc74588a493
-SIZE (e4a2b0f95cd3a18b9772b3282fdd91561956e5e3.patch) = 1584
+TIMESTAMP = 1600916134
+SHA256 (symless-synergy-core-v1.12.0-stable_GH0.tar.gz) = ec9577816569a83250216373e0925571b7618f1cd0e6dd719bf7d86a2bb4b02e
+SIZE (symless-synergy-core-v1.12.0-stable_GH0.tar.gz) = 8237539
+SHA256 (google-googletest-2fe3bd994b3189899d93f1d5a881e725e046fdc2_GH0.tar.gz) = d0d447b4feeedca837a0d46a289d4223089b32ac2f84545fa4982755cc8919be
+SIZE (google-googletest-2fe3bd994b3189899d93f1d5a881e725e046fdc2_GH0.tar.gz) = 993527
diff --git a/sysutils/synergy-1/files/patch-CMakeLists.txt b/sysutils/synergy-1/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..4a0912a4879e
--- /dev/null
+++ b/sysutils/synergy-1/files/patch-CMakeLists.txt
@@ -0,0 +1,23 @@
+Workaround for https://github.com/symless/synergy-core/issues/6788
+
+--- CMakeLists.txt.orig	2020-08-25 14:19:22 UTC
++++ CMakeLists.txt
+@@ -235,12 +235,12 @@ if (UNIX)
+             list (APPEND libs Xi)
+         endif()
+ 
+-		set (DnsSdlib "dns_sd.h")
+-		set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}")
+-		check_include_files ("${DnsSdlib}" HAVE_DNS_SD)
+-		if (NOT HAVE_DNS_SD)
+-            message (FATAL_ERROR "Missing header: " ${DnsSdlib})
+-        endif()
++		#set (DnsSdlib "dns_sd.h")
++		#set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}")
++		#check_include_files ("${DnsSdlib}" HAVE_DNS_SD)
++		#if (NOT HAVE_DNS_SD)
++            #message (FATAL_ERROR "Missing header: " ${DnsSdlib})
++        #endif()
+     endif()
+ 
+     # For config.h, set some static values; it may be a good idea to make