diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile
index 52a21e0638c8..7ec08a9744b2 100644
--- a/deskutils/nextcloudclient/Makefile
+++ b/deskutils/nextcloudclient/Makefile
@@ -1,65 +1,76 @@
 # Created by: Mathieu Arnold
 
 PORTNAME=	nextcloudclient
-PORTVERSION=	3.3.2
+PORTVERSION=	3.3.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	NextCloud Desktop Syncing Client
 
 LICENSE=	GPLv2
 
 DEPRECATED=	Uses EOL Python 2.7 via www/qt5-webengine
 EXPIRATION_DATE=2021-06-23
 
 BUILD_DEPENDS=	inkscape:graphics/inkscape
 LIB_DEPENDS=	libinotify.so:devel/libinotify \
 		libqt5keychain.so:security/qtkeychain
 
 USES=		cmake:noninja compiler:c++14-lang desktop-file-utils gmake \
 		gnome iconv localbase:ldflags pkgconfig qt:5 shared-mime-info \
 		sqlite ssl
 USE_QT=		buildtools_build concurrent core dbus declarative graphicaleffects \
 		gui linguist_build location network printsupport qmake_build \
-		quickcontrols2 sql svg testlib webchannel webengine websockets \
+		quickcontrols2 sql svg testlib webchannel websockets \
 		widgets xml
 CMAKE_ARGS=	-DBUILD_UPDATER:BOOL=OFF \
 		-DCMAKE_INSTALL_MANDIR:STRING=man \
 		-DWITH_STACK_PROTECTOR:BOOL=OFF
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 DEBUG=		yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	nextcloud
 GH_PROJECT=	desktop
 
 #OPTIONS_DEFINE=		DEBUG DOCS
-OPTIONS_DEFINE=		DEBUG # DOCS doesn't build currently
+OPTIONS_DEFINE=		DEBUG WEBENGINE # DOCS doesn't build currently
+OPTIONS_DEFAULT_amd64=		WEBENGINE
+OPTIONS_DEFAULT_i386=		WEBENGINE
+OPTIONS_DEFAULT_aarch64=	WEBENGINE
+
+WEBENGINE_DESC=		QT5 Webengine support
 
 #DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 #			doxygen:devel/doxygen
 #DOCS_USE=		tex=dvipsk:build,latex:build
 #DOCS_CMAKE_ON=		-DWITH_DOC:BOOL=ON
 
+WEBENGINE_VARS=		USE_QT+=webengine
+
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .ifdef WITH_DEBUG
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Debug
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
 
+post-patch-WEBENGINE-off:
+	@${REINPLACE_CMD} -e '/^find_package.*COMPONENTS WebEngineWidgets WebEngine/d' \
+		${WRKSRC}/src/CMakeLists.txt
+
 pre-configure:
 	@(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample)
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sync-exclude.lst ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/nextcloudclient/distinfo b/deskutils/nextcloudclient/distinfo
index e38ca0bfad74..fe33643b8d62 100644
--- a/deskutils/nextcloudclient/distinfo
+++ b/deskutils/nextcloudclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630005562
-SHA256 (nextcloud-desktop-v3.3.2_GH0.tar.gz) = 6ea5ccc9579339f2d1652f26582dbdd8212dd5e0c28659dce7fe9ddece8a59c5
-SIZE (nextcloud-desktop-v3.3.2_GH0.tar.gz) = 13987162
+TIMESTAMP = 1633008527
+SHA256 (nextcloud-desktop-v3.3.5_GH0.tar.gz) = 5e952be36ab6806ffbab6d216b05bfbd9d7e72687e0d281f492e1059cd34b419
+SIZE (nextcloud-desktop-v3.3.5_GH0.tar.gz) = 14060100
diff --git a/deskutils/nextcloudclient/files/patch-src_csync_ConfigureChecks.cmake b/deskutils/nextcloudclient/files/patch-src_csync_ConfigureChecks.cmake
new file mode 100644
index 000000000000..52cb079bdbc4
--- /dev/null
+++ b/deskutils/nextcloudclient/files/patch-src_csync_ConfigureChecks.cmake
@@ -0,0 +1,12 @@
+--- src/csync/ConfigureChecks.cmake.orig	2021-09-03 09:40:46 UTC
++++ src/csync/ConfigureChecks.cmake
+@@ -14,9 +14,6 @@ set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
+ set(BINARYDIR ${CMAKE_CURRENT_BINARY_DIR})
+ set(SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+-# HEADER FILES
+-check_include_file(argp.h HAVE_ARGP_H)
+-
+ # FUNCTIONS
+ if (NOT LINUX)
+     # librt