diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index ce5a54b7fa28a..fa0a9437ff7f6 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -195,9 +195,9 @@
     "hash": "sha256-kaSXmq4aChMZSLCz+JcIvREGsH59sPwdU708omjaYSc="
   },
   "plasma-desktop": {
-    "version": "6.3.1",
-    "url": "mirror://kde/stable/plasma/6.3.1/plasma-desktop-6.3.1.tar.xz",
-    "hash": "sha256-EZydNhJ0NnBIMghky6/8YSUwy6TqYtbf1QTz7+WyVKQ="
+    "version": "6.3.1.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-desktop-6.3.1.1.tar.xz",
+    "hash": "sha256-zgKHR9MeF2vem/RoA7LaVKy8Beu8/52cWFzALpsmrP0="
   },
   "plasma-dialer": {
     "version": "6.3.1",
diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix
index 2a8e8df9d7401..7933541b4501e 100644
--- a/pkgs/kde/plasma/plasma-desktop/default.nix
+++ b/pkgs/kde/plasma/plasma-desktop/default.nix
@@ -43,11 +43,6 @@ mkKdeDerivation {
     (replaceVars ./wallpaper-paths.patch {
       wallpapers = "${lib.getBin breeze}/share/wallpapers";
     })
-
-    # Fix build failure due to C++ template nonsense
-    # Submitted upstream: https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/2833
-    # FIXME: remove when merged
-    ./fix-build.patch
   ];
 
   extraNativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/kde/plasma/plasma-desktop/fix-build.patch b/pkgs/kde/plasma/plasma-desktop/fix-build.patch
deleted file mode 100644
index 9729ffb46bb52..0000000000000
--- a/pkgs/kde/plasma/plasma-desktop/fix-build.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/kcms/libkwindevices/inputdevice.cpp b/kcms/libkwindevices/inputdevice.cpp
-index 9a437137077390a61152be96ac69b4f5e992d062..aea0952143a29a4b2bf06777f737a84cbd6e5b6d 100644
---- a/kcms/libkwindevices/inputdevice.cpp
-+++ b/kcms/libkwindevices/inputdevice.cpp
-@@ -10,44 +10,6 @@
- 
- #include "logging.h"
- 
--template<typename T>
--bool InputDevice::Prop<T>::save()
--{
--    if (!isSupported() || !m_value || m_prop.isConstant()) {
--        qCDebug(LIBKWINDEVICES) << "skipping" << this << m_value.has_value() << isSupported() << m_prop.name();
--        return false;
--    }
--
--    auto iface = m_device->m_iface.get();
--    const bool ret = m_prop.write(iface, *m_value);
--    if (ret) {
--        m_configValue = *m_value;
--    }
--    return ret;
--}
--
--template<typename T>
--void InputDevice::Prop<T>::set(T newVal)
--{
--    if (!m_value) {
--        value();
--    }
--
--    Q_ASSERT(isSupported());
--    if (m_value != newVal) {
--        m_value = newVal;
--        if (m_changedSignalFunction) {
--            (m_device->*m_changedSignalFunction)();
--        }
--    }
--}
--
--template<typename T>
--bool InputDevice::Prop<T>::changed() const
--{
--    return m_value.has_value() && m_value.value() != m_configValue;
--}
--
- InputDevice::InputDevice(const QString &dbusName, QObject *parent)
-     : QObject(parent)
- {
-diff --git a/kcms/libkwindevices/inputdevice.h b/kcms/libkwindevices/inputdevice.h
-index 93f9753cfae3c8795c5493566f7e51c806710983..f5589b095f39aa76071f67b8ee544a71585a479a 100644
---- a/kcms/libkwindevices/inputdevice.h
-+++ b/kcms/libkwindevices/inputdevice.h
-@@ -269,12 +269,29 @@ private:
-             }
-         }
- 
--        void set(T newVal);
-+        void set(T newVal) {
-+            if (!m_value) {
-+                value();
-+            }
-+        
-+            Q_ASSERT(isSupported());
-+            if (m_value != newVal) {
-+                m_value = newVal;
-+                if (m_changedSignalFunction) {
-+                    (m_device->*m_changedSignalFunction)();
-+                }
-+            }
-+        }
-+
-         T defaultValue() const
-         {
-             return m_defaultValueFunction ? (m_device->m_iface.get()->*m_defaultValueFunction)() : T();
-         }
--        bool changed() const;
-+        
-+        bool changed() const {
-+            return m_value.has_value() && m_value.value() != m_configValue;
-+        }
-+
-         void set(const Prop<T> &p)
-         {
-             set(p.value());
-@@ -286,7 +303,20 @@ private:
-             return !m_supportedFunction || (iface->*m_supportedFunction)();
-         }
- 
--        bool save();
-+        bool save() {
-+            if (!isSupported() || !m_value || m_prop.isConstant()) {
-+                qDebug() << "skipping" << this << m_value.has_value() << isSupported() << m_prop.name();
-+                return false;
-+            }
-+        
-+            auto iface = m_device->m_iface.get();
-+            const bool ret = m_prop.write(iface, *m_value);
-+            if (ret) {
-+                m_configValue = *m_value;
-+            }
-+            return ret;
-+        }
-+
-         bool isDefaults() const
-         {
-             return m_value == defaultValue();