diff --git a/PR31495.patch b/PR31495.patch
new file mode 100644
index 0000000..d8d8192
--- /dev/null
+++ b/PR31495.patch
@@ -0,0 +1,29 @@
+commit b87891f5aff91b8ebbda8d9218009495848f7747
+Author: Martin Cermak <mcermak@redhat.com>
+Date:   Thu May 16 16:51:08 2024 +0200
+
+    PR31495: teach stap-prep to work with other RT kernels
+
+diff --git a/stap-prep b/stap-prep
+index 8b429f880..2bbb6bc2f 100755
+--- a/stap-prep
++++ b/stap-prep
+@@ -103,13 +103,16 @@ done
+ # 5.14.0-200.rt14.201.el9 ->
+ #      "kernel-rt-debug-5.14.0-200.rt14.201.el9"
+ # OR?! "kernel-rt-5.14.0-200.rt14.201.el9"
+-if expr "$UNAME" : ".*\.rt.*" >/dev/null;
++# OR??!"kernel-rt-5.14.0-447.el9.x86_64+rt"
++if expr "$UNAME" : ".*\.rt.*" || expr "$UNAME" : ".*\+rt.*" >/dev/null;
+ then
+     KERNEL=`echo $KERNEL | sed -e s,kernel,kernel-rt,`
+ fi
+ 
+ KERN_ARCH=`uname -m`
+-KERN_REV=`echo $UNAME | sed s/.$KERN_ARCH//` # strip arch from uname
++# strip arch from uname, for kernels like 5.14.0-447.el9.x86_64+rt or
++# 6.9.0-0.rc2.1.el10.x86_64+rt strip the +rt suffix too
++KERN_REV=`echo $UNAME | sed s/.$KERN_ARCH// | sed s/\+rt$//`
+ if [ -x /usr/bin/dnf4 ]; then
+     DI="dnf4 debuginfo-install"
+     DI_DEPS=""
diff --git a/plans/ci.fmf b/plans/ci.fmf
index f5041a6..b5822ae 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -1,10 +1,9 @@
 summary: CI Gating Plan
 discover:
     how: fmf
-    url: https://src.fedoraproject.org/rpms/systemtap.git
-    ref: rawhide
+    url: https://src.fedoraproject.org/tests/systemtap-gating.git
+    ref: main
     directory: tests
-    filter: 'tier: 1'
 prepare:
     - name: prepare
       how: shell
diff --git a/systemtap.spec b/systemtap.spec
index b70591e..023c95c 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -121,7 +121,7 @@ m     stapdev  stapdev
 Name: systemtap
 # PRERELEASE
 Version: 5.1
-Release: 2%{?release_override}%{?dist}
+Release: 3%{?release_override}%{?dist}
 # for version, see also configure.ac
 
 
@@ -159,6 +159,7 @@ URL: http://sourceware.org/systemtap/
 Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
 Patch1: RHEL-36199a.patch
 Patch2: RHEL-36199b.patch
+Patch3: PR31495.patch
 
 # Build*
 BuildRequires: make
@@ -587,6 +588,7 @@ or within a container.
 %setup -q
 %patch -P1 -p1
 %patch -P2 -p1
+%patch -P3 -p1
 
 %build
 
@@ -1314,6 +1316,9 @@ exit 0
 
 # PRERELEASE
 %changelog
+* Tue May 16 2024 Martin Cermak <mcermak@redhat.com> - 5.1-3
+- RHEL-7318
+
 * Tue May 14 2024 William Cohen <wcohen@redhat.com> - 5.1-2
 - RHEL-36199