diff --git a/linux-tools/riscv64.patch b/linux-tools/riscv64.patch
index 489eb0675..c2416815d 100644
--- a/linux-tools/riscv64.patch
+++ b/linux-tools/riscv64.patch
@@ -1,6 +1,6 @@
 --- PKGBUILD
 +++ PKGBUILD
-@@ -5,15 +5,10 @@ pkgname=(
+@@ -6,15 +6,10 @@
    'bootconfig'
    'bpf'
    'cpupower'
@@ -14,18 +14,9 @@
    'usbip'
 -  'x86_energy_perf_policy'
  )
- pkgver=6.12
- pkgrel=11
-@@ -69,6 +64,8 @@ sha256sums=('267bab84f30e3ce4a88b6441aeee777b114fd58041b43cabfe50fdf0c0a97321'
- prepare() {
-   cd linux
- 
-+  git cherry-pick -n 710fbca820c721cdd60fa8c5bbe9deb4c0788aae
-+
-   # apply patch from the source array (should be a pacman feature)
-   local src
-   for src in "${source[@]}"; do
-@@ -100,7 +97,8 @@ build() {
+ pkgver=6.19.5
+ pkgrel=1
+@@ -96,7 +91,8 @@
      NO_LIBLLVM=1 \
      PYTHON_CONFIG=python-config \
      LIBPFM4=1 \
@@ -35,34 +26,34 @@
    popd
  
    echo ':: cpupower'
-@@ -108,11 +106,6 @@ build() {
+@@ -104,11 +100,6 @@
    make VERSION=$pkgver-$pkgrel
    popd
  
 -  echo ':: x86_energy_perf_policy'
--  pushd linux/tools/power/x86/x86_energy_perf_policy
+-  pushd "$_srcname"/tools/power/x86/x86_energy_perf_policy
 -  make
 -  popd
 -
    echo ':: usbip'
-   pushd linux/tools/usb/usbip
+   pushd "$_srcname"/tools/usb/usbip
    # Fix gcc compilation
-@@ -127,21 +120,11 @@ build() {
+@@ -123,21 +114,11 @@
    make
    popd
  
 -  echo ':: turbostat'
--  pushd linux/tools/power/x86/turbostat
+-  pushd "$_srcname"/tools/power/x86/turbostat
 -  make
 -  popd
 -
 -  echo ':: hv'
--  pushd linux/tools/hv
+-  pushd "$_srcname"/tools/hv
 -  CFLAGS+=' -DKVP_SCRIPTS_PATH=\"/usr/lib/hypervkvpd/\"' make
 -  popd
 -
    echo ':: bpf'
-   pushd linux/tools/bpf
+   pushd "$_srcname"/tools/bpf
    # doesn't compile when we don't first compile bpftool in its own directory and
    # man pages require to be also launch from the subdirectory
 -  make -C bpftool all doc
@@ -70,24 +61,24 @@
    # runqslower, require kernel binary path to build, skip it
    make -W runqslower
    popd
-@@ -150,16 +133,6 @@ build() {
-   pushd linux/tools/bootconfig
+@@ -146,16 +127,6 @@
+   pushd "$_srcname"/tools/bootconfig
    make
    popd
 -
 -  echo ':: intel-speed-select'
--  pushd linux/tools/power/x86/intel-speed-select
+-  pushd "$_srcname"/tools/power/x86/intel-speed-select
 -  make
 -  popd
 -
 -  echo ':: kcpuid'
--  pushd linux/tools/arch/x86/kcpuid
+-  pushd "$_srcname"/tools/arch/x86/kcpuid
 -  make
 -  popd
  }
  
  package_linux-tools-meta() {
-@@ -169,14 +142,9 @@ package_linux-tools-meta() {
+@@ -165,14 +136,9 @@
      'bootconfig'
      'bpf'
      'cpupower'
@@ -102,3 +93,11 @@
    )
    conflicts=(
      'acpidump'
+@@ -198,6 +164,7 @@
+     PYTHON_CONFIG=python-config \
+     DESTDIR="$pkgdir" \
+     LIBPFM4=1 \
++    SRCARCH=riscv \
+     install install-python_ext
+   cd "$pkgdir"
+   # add linker search path