diff --git a/srcpkgs/cutter/patches/ksyntaxhighlighting.patch b/srcpkgs/cutter/patches/ksyntaxhighlighting.patch
new file mode 100644
index 0000000000..461a3dec9d
--- /dev/null
+++ b/srcpkgs/cutter/patches/ksyntaxhighlighting.patch
@@ -0,0 +1,43 @@
+diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp
+index 3c309e83..47019165 100644
+--- a/src/common/Configuration.cpp
++++ b/src/common/Configuration.cpp
+@@ -7,9 +7,9 @@
+ #include <QApplication>
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+-#    include <KSyntaxHighlighting/repository.h>
+-#    include <KSyntaxHighlighting/theme.h>
+-#    include <KSyntaxHighlighting/definition.h>
++#    include <repository.h>
++#    include <theme.h>
++#    include <definition.h>
+ #endif
+ 
+ #include "common/ColorThemeWorker.h"
+diff --git a/src/common/SyntaxHighlighter.cpp b/src/common/SyntaxHighlighter.cpp
+index 64a2038e..eebb59f9 100644
+--- a/src/common/SyntaxHighlighter.cpp
++++ b/src/common/SyntaxHighlighter.cpp
+@@ -5,7 +5,7 @@
+ 
+ #    include "Configuration.h"
+ 
+-#    include <KSyntaxHighlighting/theme.h>
++#    include <theme.h>
+ 
+ SyntaxHighlighter::SyntaxHighlighter(QTextDocument *document)
+     : KSyntaxHighlighting::SyntaxHighlighter(document)
+diff --git a/src/common/SyntaxHighlighter.h b/src/common/SyntaxHighlighter.h
+index b9e88970..a21b4ec2 100644
+--- a/src/common/SyntaxHighlighter.h
++++ b/src/common/SyntaxHighlighter.h
+@@ -10,7 +10,7 @@
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+ 
+-#    include <KSyntaxHighlighting/syntaxhighlighter.h>
++#    include <syntaxhighlighter.h>
+ 
+ class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter
+ {
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 7142c048f5..0ba35058db 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,16 +1,30 @@
 # Template file for 'cutter'
 pkgname=cutter
-version=1.12.0
-revision=2
-build_wrksrc=src
-build_style=qmake
-configure_args="CUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/RadareOrg/Cutter/plugins"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools radare2"
-makedepends="capstone-devel python3-devel qt5-declarative-devel
- qt5-location-devel qt5-svg-devel radare2"
+version=2.0.5
+revision=1
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins
+ -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF
+ -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON
+ -DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+ -DCUTTER_ENABLE_CRASH_REPORTS=OFF"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools meson git"
+makedepends="capstone-devel python3-devel qt5-declarative-devel qt5-location-devel
+ qt5-svg-devel graphviz-devel libshiboken2-devel libpyside2-python3-devel
+ syntax-highlighting-devel rizin-devel"
 short_desc="GUI for radare2 written in C++ and QT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="GPL-3.0-only"
-homepage="https://github.com/radareorg/cutter"
-distfiles="https://github.com/radareorg/${pkgname}/archive/v${version}.tar.gz"
-checksum=868213d2ea0b4a29b9b03c9b605c2b2155c4c03b62735a9bd376a0dadcb4fe1b
+homepage="https://cutter.re"
+_translations_commit="974298653ba71b958e1b6c83f6011f5fefff6236"
+distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz
+ https://github.com/rizinorg/cutter-translations/archive/${_translations_commit}.tar.gz"
+checksum="c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab
+ 9a9d42769c1e9364dfc694968b05994d02ea840813a33b16ca6a6cbe80c90069"
+
+
+post_extract() {
+	rmdir src/translations
+	mv "${XBPS_BUILDDIR}/cutter-translations-${_translations_commit}" "src/translations"
+}