diff --git a/desktop/kde/admin/grub2-editor/actions.py b/desktop/kde/admin/grub2-editor/actions.py
index eb8308c514..65c53d2f47 100644
--- a/desktop/kde/admin/grub2-editor/actions.py
+++ b/desktop/kde/admin/grub2-editor/actions.py
@@ -1,20 +1,24 @@
-#!/usr/bin/python

-# -*- coding: utf-8 -*-

-# Licensed under the GNU General Public License, version 3.

-# See the file http://www.gnu.org/copyleft/gpl.txt

-

-from pisi.actionsapi import kde5

-from pisi.actionsapi import pisitools

-

-

-def setup():

-    kde5.configure()

-

-def build():

-    kde5.make()

-

-def install():

-    kde5.install()

-

-    pisitools.dodoc("ChangeLog", "COPYING", "README*")

-

+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/copyleft/gpl.txt
+
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import kde6
+from pisi.actionsapi import get
+
+
+def setup():
+    kde6.configure()
+
+def build():
+    kde6.make()
+
+def install():
+    kde6.install()
+
+    pisitools.dodoc("COPYING", "README*")
+
+
+
diff --git a/desktop/kde/admin/grub2-editor/pspec.xml b/desktop/kde/admin/grub2-editor/pspec.xml
index 2fbd444abf..a9c3d39fe1 100644
--- a/desktop/kde/admin/grub2-editor/pspec.xml
+++ b/desktop/kde/admin/grub2-editor/pspec.xml
@@ -11,27 +11,29 @@
         <License>GPL</License>
         <Summary>A KDE Control Module for configuring the GRUB2 bootloader</Summary>
         <Description>Smoothly integrated in KDE System Settings, it is the central place for managing your GRUB2 configuration. Supports many GRUB2 configuration options.</Description>
-<Archive sha1sum="170a2dff605235f1b3135aa60da331e790ad00c4" type="targz">https://github.com/maz-1/grub2-editor/archive/0.8.1.tar.gz</Archive>
+<!-- <Archive sha1sum="170a2dff605235f1b3135aa60da331e790ad00c4" type="targz">https://github.com/maz-1/grub2-editor/archive/0.8.1.tar.gz</Archive> -->
 <!--  <Archive sha1sum="031f5813f315a0ee32e1265a302178d98d24455a" type="targz">https://sourceforge.net/projects/pisilinux/files/source/grub2-editor-0.7.0.tar.gz</Archive> -->
+        <Archive sha1sum="96eb90cb6101aa02123fab2a8ae014fbbe1f8ec5" type="tarbz2">https://invent.kde.org/system/kcm-grub2/-/archive/master/kcm-grub2-master.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>extra-cmake-modules</Dependency>
             <Dependency>gettext-devel</Dependency>
             <Dependency>grub2</Dependency>
+            <Dependency>kcmutils-devel</Dependency>
             <Dependency>os-prober</Dependency>
-            <Dependency>GraphicsMagick-devel</Dependency>
+            <Dependency>kauth-devel</Dependency>
             <Dependency>imagemagick-devel</Dependency>
-            <Dependency>kauth5-devel</Dependency>
-            <Dependency>kconfigwidgets5-devel</Dependency>
-            <Dependency>kcoreaddons5-devel</Dependency>
-            <Dependency>kdoctools5-devel</Dependency>
-            <Dependency>ki18n5-devel</Dependency>
-            <Dependency>kio5-devel</Dependency>
-            <Dependency>qca2-qt5-devel</Dependency>
-            <Dependency>qt5-base-devel</Dependency>
-            <Dependency>solid5-devel</Dependency>
+            <Dependency>kauth-devel</Dependency>
+            <Dependency>kconfigwidgets-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+<!--             <Dependency>kdoctools5-devel</Dependency> -->
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>kio-devel</Dependency>
+<!--             <Dependency>qca2-qt5-devel</Dependency> -->
+            <Dependency>qt6-base-devel</Dependency>
+            <Dependency>solid-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">grub2.patch</Patch>
+<!--             <Patch level="1">grub2.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -47,21 +49,30 @@
         </Files>
         <Summary>A KDE Control Module for configuring the GRUB2 bootloader</Summary>
         <RuntimeDependencies>
-            <Dependency>kio5</Dependency>
-            <Dependency>kauth5</Dependency>
-            <Dependency>ki18n5</Dependency>
-            <Dependency>solid5</Dependency>
+            <Dependency>kio</Dependency>
+<!--             <Dependency>kauth5</Dependency> -->
+            <Dependency>ki18n</Dependency>
+            <Dependency>solid</Dependency>
+            <Dependency>kauth</Dependency>
+            <Dependency>kcmutils</Dependency>
             <Dependency>libgcc</Dependency>
-            <Dependency>qt5-base</Dependency>
+            <Dependency>qt6-base</Dependency>
             <Dependency>imagemagick</Dependency>
-            <Dependency>kcompletion5</Dependency>
-            <Dependency>kcoreaddons5</Dependency>
-            <Dependency>kconfigwidgets5</Dependency>
-            <Dependency>kwidgetsaddons5</Dependency>
+            <Dependency>kcompletion</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+<!--             <Dependency>kwidgetsaddons5</Dependency> -->
         </RuntimeDependencies>
     </Package>
 
     <History>
+        <Update release="15">
+            <Date>2026-03-01</Date>
+            <Version>0.8.1</Version>
+            <Comment>Rebuild for kde6</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
         <Update release="14">
             <Date>2025-02-02</Date>
             <Version>0.8.1</Version>