diff --git a/deskutils/syncthingtray/Makefile b/deskutils/syncthingtray/Makefile
index f4aad50055e7..28c4d70f47bf 100644
--- a/deskutils/syncthingtray/Makefile
+++ b/deskutils/syncthingtray/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	syncthingtray
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.8
 DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Qt 5-based Syncthing tray application
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/syncthingtray/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmake-modules \
 		doxygen:devel/doxygen
 LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
 		libboost_regex.so:devel/boost-libs
 
 USES=		cmake:insource compiler:c++11-lang iconv kde:5 qt:5
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	Martchus:${PORTNAME}:${DISTVERSIONPREFIX}${DISTVERSION}:syncthingtray/../syncthingtray \
-		Martchus:cpp-utilities:v5.10.2:cpputilities/../c++utilities \
-		Martchus:qtutilities:v6.4.0:qtutilities/../qtutilities \
+		Martchus:cpp-utilities:v5.10.5:cpputilities/../c++utilities \
+		Martchus:qtutilities:v6.4.2:qtutilities/../qtutilities \
 		Martchus:subdirs:f3b12f9:subdirs/../subdirs
 
 USE_KDE=	plasma-framework
 USE_QT=		concurrent core dbus declarative gui location network \
 		printsupport qdbus quickcontrols2 svg webchannel \
 		widgets x11extras buildtools_build doc_build linguist_build \
 		qmake_build testlib_build
 
-CMAKE_OFF=	USE_STANDARD_FILESYSTEM
+CMAKE_OFF=	USE_STANDARD_FILESYSTEM SYSTEMD_SUPPORT
 
 CONFIGURE_WRKSRC=	${WRKDIR}
 BUILD_WRKSRC=		${WRKDIR}
 INSTALL_WRKSRC=		${WRKDIR}
 CMAKE_SOURCE_PATH=	${WRKDIR}/subdirs/syncthingtray
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 DEPRECATED=	Uses EOL Python 2.7 via www/qt5-webengine
 EXPIRATION_DATE=2021-06-23
 USE_QT+=	webengine
 .else
 CMAKE_ARGS+=	-DWEBVIEW_PROVIDER=webkit
 USE_QT+=	webkit
 .endif
 
 post-install:
 	${RM} -r \
 		${STAGEDIR}${PREFIX}/include/c++utilities \
 		${STAGEDIR}${PREFIX}/include/qtutilities \
 		${STAGEDIR}${PREFIX}/lib/libc++utilities.a \
 		${STAGEDIR}${PREFIX}/lib/libqtutilities.a \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/c++utilities.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/qtutilities.pc \
 		${STAGEDIR}${PREFIX}/share/c++utilities \
 		${STAGEDIR}${PREFIX}/share/qtutilities \
 		${STAGEDIR}${PREFIX}/share/syncthingconnector/cmake \
 		${STAGEDIR}${PREFIX}/share/syncthingfileitemaction/cmake \
 		${STAGEDIR}${PREFIX}/share/syncthingmodel/cmake \
 		${STAGEDIR}${PREFIX}/share/syncthingplasmoid/cmake \
 		${STAGEDIR}${PREFIX}/share/syncthingwidgets/cmake \
 		${STAGEDIR}${PREFIX}/include/syncthingconnector \
 		${STAGEDIR}${PREFIX}/include/syncthingmodel \
 		${STAGEDIR}${PREFIX}/include/syncthingwidgets \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingconnector.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingfileitemaction.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingmodel.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingplasmoid.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingwidgets.pc \
 		${STAGEDIR}${PREFIX}/lib/libsyncthingconnector.a \
 		${STAGEDIR}${PREFIX}/lib/libsyncthingmodel.a \
 		${STAGEDIR}${PREFIX}/lib/libsyncthingwidgets.a \
 		${STAGEDIR}${QT_PLUGINDIR} \
 		${STAGEDIR}${QT_LIBDIR}
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/syncthingtray/distinfo b/deskutils/syncthingtray/distinfo
index 69375337047f..ed8a1e8a5648 100644
--- a/deskutils/syncthingtray/distinfo
+++ b/deskutils/syncthingtray/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1618192488
-SHA256 (Martchus-syncthingtray-v1.1.5_GH0.tar.gz) = cc8909020bbfb8fbd1fd902c87f3c1d7aeac43588d6bb3fb0ed78c82ca74b315
-SIZE (Martchus-syncthingtray-v1.1.5_GH0.tar.gz) = 1554686
-SHA256 (Martchus-cpp-utilities-v5.10.2_GH0.tar.gz) = 65c34689a2d88dc0f7bb70e5bd5a0128ee6e97746504d10239d9e6820a835d54
-SIZE (Martchus-cpp-utilities-v5.10.2_GH0.tar.gz) = 166073
-SHA256 (Martchus-qtutilities-v6.4.0_GH0.tar.gz) = c6c06a4e6648529e34e7f9bd12058d74b5e28ad755f99213dfd7d551b630ed70
-SIZE (Martchus-qtutilities-v6.4.0_GH0.tar.gz) = 109549
+TIMESTAMP = 1626355716
+SHA256 (Martchus-syncthingtray-v1.1.8_GH0.tar.gz) = 82a3ca453dd74bd2d73b49a5288eb52683ce26fbc7d4a2f6445aa57df6dc2f35
+SIZE (Martchus-syncthingtray-v1.1.8_GH0.tar.gz) = 1563970
+SHA256 (Martchus-cpp-utilities-v5.10.5_GH0.tar.gz) = 36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+SIZE (Martchus-cpp-utilities-v5.10.5_GH0.tar.gz) = 168627
+SHA256 (Martchus-qtutilities-v6.4.2_GH0.tar.gz) = a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+SIZE (Martchus-qtutilities-v6.4.2_GH0.tar.gz) = 109593
 SHA256 (Martchus-subdirs-f3b12f9_GH0.tar.gz) = b4879e20a46ea6b24558264dbd9f20072de94fa32b71b4d60e0d39523aae769f
 SIZE (Martchus-subdirs-f3b12f9_GH0.tar.gz) = 8834
diff --git a/deskutils/syncthingtray/files/patch-plasmoid-lib-syncthingapplet.cpp b/deskutils/syncthingtray/files/patch-plasmoid-lib-syncthingapplet.cpp
new file mode 100644
index 000000000000..482b042a1ff1
--- /dev/null
+++ b/deskutils/syncthingtray/files/patch-plasmoid-lib-syncthingapplet.cpp
@@ -0,0 +1,11 @@
+--- ../syncthingtray/plasmoid/lib/syncthingapplet.cpp.orig	2021-07-15 09:55:51.079368000 -0400
++++ ../syncthingtray/plasmoid/lib/syncthingapplet.cpp	2021-07-15 09:56:54.332702000 -0400
+@@ -226,7 +226,7 @@
+     const auto systemdConsideredForReconnect
+         = settings.systemd.apply(m_connection, currentConnectionConfig(), reconnectRequired).consideredForReconnect;
+ #else
+-    const auto systemdRelevantForReconnect = false;
++    const auto systemdConsideredForReconnect = false;
+ #endif
+     if (!systemdConsideredForReconnect && (reconnectRequired || !m_connection.isConnected())) {
+         m_connection.reconnect();