diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index 536ae8a2d91f..4abdef4c9faa 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -1,90 +1,84 @@
 PORTNAME=	synergy
-DISTVERSION=	1.14.6.19
-DISTVERSIONSUFFIX=	-stable
-PORTREVISION=	2
+DISTVERSION=	1.15.1
+DISTVERSIONSUFFIX=	+r1
 PORTEPOCH=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Mouse and keyboard sharing utility
 WWW=		https://symless.com/synergy
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libnotify.so:devel/libnotify \
 		libxkbfile.so:x11/libxkbfile
 
-USES=		cmake compiler:c++14-lang cpe gnome localbase:ldflags pkgconfig qt:5 ssl xorg
+USES=		cmake compiler:c++14-lang cpe gnome localbase:ldflags pkgconfig qt:6 ssl xorg
 CPE_VENDOR=	synergy-foss
-USE_QT=		core dbus network widgets buildtools:build linguisttools:build qmake:build
+USE_QT=		base tools:build
 USE_GNOME=	gdkpixbuf2 glib20
 USE_XORG=	ice xtst x11 sm xext xinerama xrandr xi
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	symless
-GH_PROJECT=	synergy-core
 GH_TUPLE=	google:googletest:18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6:google_googletest/ext/googletest \
 		mohabouje:WinToast:8abb85b:WinToast/ext/WinToast \
 		zeux:pugixml:9e382f9:pugixml/ext/pugixml
 
 CMAKE_ARGS=	-DSYNERGY_REVISION:STRING=${PORTVERSION:S/.//g}00 # it expects a 8-digit hash
 CMAKE_OFF=	BUILD_TESTS
 
 PORTEXAMPLES=	synergy.conf.example synergy.conf.example-basic \
 		synergy.conf.example-advanced
 
 OPTIONS_DEFINE=			AVAHI_LIBDNS EXAMPLES LEGACY
 OPTIONS_DEFAULT=		AVAHI_LIBDNS
 OPTIONS_SUB=			yes
 
 AVAHI_LIBDNS_DESC=		Use libdns from avahi to avoid conflicts with KDE/Gnome
 AVAHI_LIBDNS_CFLAGS=		`pkg-config --cflags avahi-compat-libdns_sd`
 AVAHI_LIBDNS_LDFLAGS=		`pkg-config --libs avahi-compat-libdns_sd`
 AVAHI_LIBDNS_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
 AVAHI_LIBDNS_LDFLAGS_OFF=	-ldns_sd
 AVAHI_LIBDNS_LIB_DEPENDS_OFF=	libdns_sd.so:net/mDNSResponder
 
 LEGACY_DESC=			Build the legacy GUI, synergyd, installer
 LEGACY_CONFIGURE_ENV_OFF=	SYNERGY_NO_LEGACY=true
 LEGACY_USE=			QT=gui
 
 post-patch:
 	# Hardcoded path needs to be replaced with
 	#   --with-xkb-base defined in x11/keyboard-config
 	@${REINPLACE_CMD} -e 's|/usr/share/X11/xkb|${PREFIX}/share/X11/xkb|' \
 		${WRKSRC}/src/lib/synergy/unix/AppUtilUnix.cpp
 	@${REINPLACE_CMD} -e 's|return "/etc"|return "${PREFIX}/etc"|' \
 		${WRKSRC}/src/lib/arch/unix/ArchFileUnix.cpp
-	@${REINPLACE_CMD} -e 's|/etc/synergy.conf|${PREFIX}/etc/synergy.conf|' \
-		${WRKSRC}/doc/synergys.man
 
 do-install: # https://github.com/symless/synergy-core/issues/6895
 .for f in synergyc synergys
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/${f}.man \
-		${STAGEDIR}${PREFIX}/share/man/man1/${f}.1
 .endfor
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/syntool ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/doc/synergy.conf.example-basic ${STAGEDIR}${PREFIX}/etc/synergy.conf.sample # server config
 
 do-install-LEGACY-on:
 .for f in synergy synergyd
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${BUILD_WRKSRC}/bin/unittests \
 		${BUILD_WRKSRC}/bin/integtests
 
 .include <bsd.port.mk>
diff --git a/sysutils/synergy/distinfo b/sysutils/synergy/distinfo
index 6d183a658bd5..407674353487 100644
--- a/sysutils/synergy/distinfo
+++ b/sysutils/synergy/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1688266429
-SHA256 (symless-synergy-core-1.14.6.19-stable_GH0.tar.gz) = 01854ec932845975cd81363bed8276b95c07a607050683fc1b74b7126199de79
-SIZE (symless-synergy-core-1.14.6.19-stable_GH0.tar.gz) = 4658286
+TIMESTAMP = 1725086844
+SHA256 (symless-synergy-1.15.1+r1_GH0.tar.gz) = 42fbf26c634d2947c7efc45da8c9a153387bcdcb19c1102a4f7c4e95aad5c708
+SIZE (symless-synergy-1.15.1+r1_GH0.tar.gz) = 4127199
 SHA256 (google-googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6_GH0.tar.gz) = d518c1c146c5a87cdedbee8535a396f95d91e8b39baa539fd4c50bd62148d199
 SIZE (google-googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6_GH0.tar.gz) = 876756
 SHA256 (mohabouje-WinToast-8abb85b_GH0.tar.gz) = 2c991d7ea93cc7d15b7a0f421e0d1906c081968adb252285dba7e9ae8e667f40
 SIZE (mohabouje-WinToast-8abb85b_GH0.tar.gz) = 128410
 SHA256 (zeux-pugixml-9e382f9_GH0.tar.gz) = f78007030f7120646081276d32acfb77cf2636f6ba5f20ab1430c2146092d4d6
 SIZE (zeux-pugixml-9e382f9_GH0.tar.gz) = 567857
diff --git a/sysutils/synergy/files/patch-cmake_Build.cmake b/sysutils/synergy/files/patch-cmake_Build.cmake
new file mode 100644
index 000000000000..e2eb778e526b
--- /dev/null
+++ b/sysutils/synergy/files/patch-cmake_Build.cmake
@@ -0,0 +1,10 @@
+--- cmake/Build.cmake.orig	2024-08-31 06:52:24 UTC
++++ cmake/Build.cmake
+@@ -18,7 +18,6 @@ elseif(UNIX)
+   add_compile_options(/WX)
+ elseif(UNIX)
+   message(STATUS "Enabling warnings as errors (GNU/Clang)")
+-  add_compile_options(-Werror)
+ endif()
+ 
+ macro(post_config)
diff --git a/sysutils/synergy/pkg-plist b/sysutils/synergy/pkg-plist
index f9754b5d9223..7de396a321da 100644
--- a/sysutils/synergy/pkg-plist
+++ b/sysutils/synergy/pkg-plist
@@ -1,8 +1,6 @@
 %%LEGACY%%bin/synergy
 bin/synergyc
 %%LEGACY%%bin/synergyd
 bin/synergys
 bin/syntool
-share/man/man1/synergyc.1.gz
-share/man/man1/synergys.1.gz
 @sample etc/synergy.conf.sample