diff --git a/.bpftrace.metadata b/.bpftrace.metadata
index 2952293..8435764 100644
--- a/.bpftrace.metadata
+++ b/.bpftrace.metadata
@@ -1,2 +1,2 @@
-b17c71c9c5a78cbe152b1346e6d18f29eb6e4b9e SOURCES/bpftrace-0.19.1.tar.gz
+dd96c1972002288a6a1105020e16391ff81f3641 SOURCES/bpftrace-0.21.1.tar.gz
 974ee680e1eb103c415832d69742e194b661da5c SOURCES/cereal-1.3.2.tar.gz
diff --git a/.gitignore b/.gitignore
index 7e70cee..f388a36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/bpftrace-0.19.1.tar.gz
+SOURCES/bpftrace-0.21.1.tar.gz
 SOURCES/cereal-1.3.2.tar.gz
diff --git a/SOURCES/bpftrace-0.19.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch b/SOURCES/bpftrace-0.21.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
similarity index 96%
rename from SOURCES/bpftrace-0.19.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
rename to SOURCES/bpftrace-0.21.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
index 9425645..17a3e2a 100644
--- a/SOURCES/bpftrace-0.19.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
+++ b/SOURCES/bpftrace-0.21.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
@@ -1,4 +1,4 @@
-From 8066a715dbd54e6cbfa66176544944a2df7952a6 Mon Sep 17 00:00:00 2001
+From cae27a1842c038bb59fb8e3ee48018d0e69f2a3c Mon Sep 17 00:00:00 2001
 From: Jerome Marchand <jmarchan@redhat.com>
 Date: Thu, 11 Jun 2020 14:56:36 +0200
 Subject: [PATCH] RHEL: aarch64: fixes statsnoop and opensnoop
@@ -62,5 +62,5 @@ index a76b2bcc..89c2c8ea 100755
  {
  	$ret = args.ret;
 -- 
-2.41.0
+2.45.0
 
diff --git a/SPECS/bpftrace.spec b/SPECS/bpftrace.spec
index 1915841..c6e91b6 100644
--- a/SPECS/bpftrace.spec
+++ b/SPECS/bpftrace.spec
@@ -1,5 +1,5 @@
 Name:           bpftrace
-Version:        0.19.1
+Version:        0.21.1
 Release:        1%{?dist}
 Summary:        High-level tracing language for Linux eBPF
 License:        ASL 2.0
@@ -31,6 +31,7 @@ BuildRequires:  bcc-devel >= 0.19.0-8
 BuildRequires:  libbpf-devel
 BuildRequires:  libbpf-static
 BuildRequires:  binutils-devel
+BuildRequires:  lldb-devel
 
 
 %description
@@ -93,6 +94,27 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
 %exclude %{_datadir}/%{name}/tools/old
 
 %changelog
+* Thu Jun 27 2024 Viktor Malik <vmalik@redhat.com> - 0.21.1-1
+- Rebase on bpftrace 0.21.1
+- Add LLVM 18 support (RHEL-28685)
+
+* Thu May 30 2024 Viktor Malik <vmalik@redhat.com> - 0.20.4-3
+- Fix latest build (not built in side tag)
+
+* Thu May 30 2024 Viktor Malik <vmalik@redhat.com> - 0.20.4-2
+- Rebuild for bcc 0.30.0-4
+
+* Thu May 30 2024 Viktor Malik <vmalik@redhat.com> - 0.20.4-1
+- Rebase on bpftrace 0.20.4
+- Fix CVE allowing unprivileged users loading of compromised linux headers
+  (RHEL-28765, CVE-2024-2313)
+
+* Fri May 03 2024 Viktor Malik <vmalik@redhat.com>  - 0.20.3-1
+- Rebase on bpftrace 0.20.3 (RHEL-30779)
+- Fix CVE allowing unprivileged users loading of compromised linux headers
+  (RHEL-28765, CVE-2024-2313)
+- Fix bpftrace creating BPF programs with truncated names (RHEL-8502)
+
 * Mon Nov 06 2023 Viktor Malik <vmalik@redhat.com> - 0.19.1-1
 - Rebase on bpftrace 0.19.1 (RHEL-10693)
 - Rebuild for LLVM 17 (RHEL-10592)