diff --git a/srcpkgs/nextcloud-client/patches/cross.patch b/srcpkgs/nextcloud-client/patches/cross.patch
deleted file mode 100644
index 60976e8823fb9e..00000000000000
--- a/srcpkgs/nextcloud-client/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -393,8 +393,8 @@ else()
-    set_property(SOURCE ../3rdparty/qtlockedfile/qtlockedfile_win.cpp PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
- endif()
- 
--find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} COMPONENTS LinguistTools)
--if(Qt${QT_MAJOR_VERSION}LinguistTools_FOUND)
-+find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} COMPONENTS Linguist)
-+if(Qt${QT_MAJOR_VERSION}Linguist_FOUND)
-     qt_add_translation(client_I18N ${TRANSLATIONS})
- endif()
- 
diff --git a/srcpkgs/nextcloud-client/patches/musl.patch b/srcpkgs/nextcloud-client/patches/musl.patch
index a6e64434a94af0..f1a17bf92cec0c 100644
--- a/srcpkgs/nextcloud-client/patches/musl.patch
+++ b/srcpkgs/nextcloud-client/patches/musl.patch
@@ -1,11 +1,17 @@
 --- a/src/common/utility.cpp
 +++ b/src/common/utility.cpp
-@@ -173,7 +173,7 @@ QByteArray Utility::friendlyUserAgentStr
+@@ -173,12 +173,12 @@
  
  qint64 Utility::freeDiskSpace(const QString &path)
  {
--#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
-+#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) || (defined(Q_OS_LINUX) && !defined(__GLIBC__))
+-#if defined(Q_OS_MACOS) || defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
++#if defined(Q_OS_MACOS) || defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) || (defined(Q_OS_UNIX) && !defined(__GLIBC__))
      struct statvfs stat;
      if (statvfs(path.toLocal8Bit().data(), &stat) == 0) {
          return (qint64)stat.f_bavail * stat.f_frsize;
+     }
+-#elif defined(Q_OS_UNIX)
++#elif defined(Q_OS_UNIX) && defined(__GLIBC__)
+     struct statvfs64 stat{};
+     if (statvfs64(path.toLocal8Bit().data(), &stat) == 0) {
+         return (qint64)stat.f_bavail * stat.f_frsize;
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 1e323ab7da7d18..eeddaf6409b745 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,6 +1,6 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.17.2
+version=4.0.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_UPDATER=NO -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
@@ -19,13 +19,13 @@ license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 changelog="https://github.com/nextcloud/desktop/releases"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=c79c7e05ae3b141e2c4b19da0cde479b63af80eb49164c99af8fa28a38e05aeb
+checksum=7254065a49b9a65cee172468624405f2fbbeedfa8c5238891786198f8f458c6c
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
 make_check=ci-skip
 replaces="nextcloud-client-kwallet>=0 nextcloud-client-dolphin>=0"
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ] &&
-   [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" = "64$XBPS_TARGET_WORDSIZE" ]; then
+	[ "$XBPS_WORDSIZE$XBPS_WORDSIZE" = "64$XBPS_TARGET_WORDSIZE" ]; then
 	configure_args+=" -DBUILD_WITH_WEBENGINE=ON"
 	makedepends+=" qt6-webengine-devel"
 else