diff --git a/.gitignore b/.gitignore
index a114228..7f9e4de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /bpftrace-0.19.1.tar.gz
 /bpftrace-0.20.1.tar.gz
 /bpftrace-0.21.1.tar.gz
+/bpftrace-0.22.1.tar.gz
diff --git a/bpftrace-0.21.1-cmake-Bump-max-LLVM-version-to-19.patch b/bpftrace-0.21.1-cmake-Bump-max-LLVM-version-to-19.patch
deleted file mode 100644
index ce33c19..0000000
--- a/bpftrace-0.21.1-cmake-Bump-max-LLVM-version-to-19.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6531fcc5da47ec8c161b08587f69eb90bffa53b8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 16 Feb 2024 10:14:41 -0800
-Subject: [PATCH] cmake: Bump max LLVM version to 19
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2e1a32bd..3f095dba 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -149,7 +149,7 @@ else()
- endif()
- 
- set(MIN_LLVM_MAJOR 6)
--set(MAX_LLVM_MAJOR 18)
-+set(MAX_LLVM_MAJOR 19)
- 
- if((${LLVM_VERSION_MAJOR} VERSION_LESS ${MIN_LLVM_MAJOR}) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER ${MAX_LLVM_MAJOR}))
-   message(SEND_ERROR "Unsupported LLVM version found via ${LLVM_INCLUDE_DIRS}: ${LLVM_VERSION_MAJOR}")
--- 
-2.47.0
-
diff --git a/bpftrace-0.21.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch b/bpftrace-0.22.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
similarity index 100%
rename from bpftrace-0.21.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
rename to bpftrace-0.22.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
diff --git a/bpftrace.spec b/bpftrace.spec
index dc60c06..f92a114 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,13 +1,12 @@
 Name:           bpftrace
-Version:        0.21.1
-Release:        3%{?dist}
+Version:        0.22.1
+Release:        1%{?dist}
 Summary:        High-level tracing language for Linux eBPF
 License:        Apache-2.0
 
 URL:            https://github.com/iovisor/bpftrace
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
-Patch0:         %{name}-%{version}-cmake-Bump-max-LLVM-version-to-19.patch
 Patch10:        %{name}-%{version}-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
 
 # Arches will be included as upstream support is added and dependencies are
@@ -84,6 +83,9 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
 
 
 %changelog
+* Thu Jan 16 2025 Viktor Malik <vmalik@redhat.com> - 0.22.1-1
+- Rebase to upstream version 0.22.1 (RHEL-63882)
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.21.1-3
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018
diff --git a/sources b/sources
index c00bb53..1e1dffe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bpftrace-0.21.1.tar.gz) = db6f5faf65fc2ac55ffbd1799b70941b8a6e4036c7fc2f56fe134f932dcf8a14fdd11a5a8b1d4b20261932d2d1ac18636cc1d7d4b87b31e366a9e53514a84ad3
+SHA512 (bpftrace-0.22.1.tar.gz) = 3bf00f97750092e66bd94b20b3889f29e932f45ae7f75966f1f364013fb9aeaad837617c0a28402fd9323d62773dd3dab0e9749d8dcb9da9c77093f17fce4d91