diff --git a/0001-Workaround-OpaquePointers-for-LLVM-15.patch b/0001-Workaround-OpaquePointers-for-LLVM-15.patch
deleted file mode 100644
index a8bd291bdd05b038e6f0a451008004aa5c160866..0000000000000000000000000000000000000000
--- a/0001-Workaround-OpaquePointers-for-LLVM-15.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 07fa48a94ef6d6bb1f335de345de18fe9776ca57 Mon Sep 17 00:00:00 2001
-From: kenneth topp <toppk@bllue.org>
-Date: Mon, 26 Sep 2022 00:33:29 -0400
-Subject: [PATCH] Workaround OpaquePointers for LLVM 15
-
-This workaround allows bpftrace to be compiled against
-LLVM-15.  This will have to be address properly before LLVM-16
-More details from LLVM here: https://llvm.org/docs/OpaquePointers.html
----
- src/ast/irbuilderbpf.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
-index d49883f7..00f0f172 100644
---- a/src/ast/irbuilderbpf.cpp
-+++ b/src/ast/irbuilderbpf.cpp
-@@ -123,6 +123,9 @@ IRBuilderBPF::IRBuilderBPF(LLVMContext &context,
-     module_(module),
-     bpftrace_(bpftrace)
- {
-+#if LLVM_VERSION_MAJOR == 15
-+  context.setOpaquePointers(false);
-+#endif
-   // Declare external LLVM function
-   FunctionType *pseudo_func_type = FunctionType::get(
-       getInt64Ty(),
--- 
-2.37.3
-
diff --git a/bpftrace-0.20.1.tar.gz b/bpftrace-0.20.1.tar.gz
deleted file mode 100644
index d14c27923db9d5100199462625fe299d6c1cd829..0000000000000000000000000000000000000000
Binary files a/bpftrace-0.20.1.tar.gz and /dev/null differ
diff --git a/bpftrace-0.22.1.tar.gz b/bpftrace-0.22.1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..4cb5d7273bba1ef47438d9ab427038610334125a
Binary files /dev/null and b/bpftrace-0.22.1.tar.gz differ
diff --git a/bpftrace.spec b/bpftrace.spec
index b81b5c740b4e11817065a2414fb5b3c6a50f57d1..446179d742ea1c6c665aec060fdf909f7baf1db4 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,24 +1,34 @@
 %define anolis_release 1
-%global __os_install_post %{nil}
-%global _find_debuginfo_opts -g
-
 Name:           bpftrace
-Version:        0.20.1
+Version:        0.22.1
 Release:        %{anolis_release}%{?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
-Patch1:         0001-Workaround-OpaquePointers-for-LLVM-15.patch
 
 # Arches will be included as upstream support is added and dependencies are
 # satisfied in the respective arches
-ExclusiveArch:  x86_64 aarch64
-
-BuildRequires:  gcc-c++ cmake llvm-devel clang-devel rubygem-asciidoctor llvm-googletest
-BuildRequires:  bison flex elfutils-libelf-devel zlib-devel bcc-devel >= 0.19.0-1
-BuildRequires:  libbpf-devel libbpf-static binutils-devel cereal-devel libdwarf-devel python3-setuptools
+ExclusiveArch:  x86_64 %{power64} aarch64 s390x
+
+BuildRequires:  gcc-c++
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  cmake
+BuildRequires:  elfutils-libelf-devel
+BuildRequires:  zlib-devel
+BuildRequires:  llvm-devel
+BuildRequires:  clang-devel
+BuildRequires:  bcc-devel >= 0.19.0-1
+BuildRequires:  libbpf-devel
+BuildRequires:  libbpf-static
+BuildRequires:  binutils-devel
+BuildRequires:  cereal-devel
+BuildRequires:  lldb-devel
+BuildRequires:  rubygem-asciidoctor
+BuildRequires:  llvm-googletest
+BuildRequires:  libxml2-devel libffi-devel
 
 
 %description
@@ -51,6 +61,12 @@ The %{name}-doc package contains documentation files for %{name}
 
 
 %install
+# The post hooks strip the binary which removes
+# the BEGIN_trigger and END_trigger functions
+# which are needed for the BEGIN and END probes
+%global __os_install_post %{nil}
+%global _find_debuginfo_opts -g
+
 %cmake_install
 
 find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
@@ -59,7 +75,9 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
 %generate_compatibility_deps
 
 %files
-%doc docs/reference_guide.md docs/tutorial_one_liners.md
+%doc README.md CONTRIBUTING-TOOLS.md
+%doc man/adoc/bpftrace.adoc docs/tutorial_one_liners.md
+%dir %{abidir}
 %license LICENSE
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/tools
@@ -67,19 +85,23 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
 %dir %{_datadir}/%{name}/tools/old
 %{_bindir}/%{name}
 %{_bindir}/%{name}-aotrt
+%{abidir}/bpftrace-aotrt-option.list
+%{abidir}/bpftrace-option.list
 %{_mandir}/man8/*
 %attr(0755,-,-) %{_datadir}/%{name}/tools/*.bt
 %attr(0755,-,-) %{_datadir}/%{name}/tools/old/*.bt
 %{_datadir}/%{name}/tools/doc/*.txt
-
-%dir %{abidir}
-%{abidir}/bpftrace-aotrt-option.list
-%{abidir}/bpftrace-option.list
+%exclude %{_datadir}/%{name}/tools/old
 
 %files doc
-%doc README.md CONTRIBUTING-TOOLS.md
+%doc CHANGELOG.md INSTALL.md README.md
+%doc docs/reference_guide.md docs/tutorial_one_liners.md
 
 %changelog
+* Wed Feb 26 2025 Zhao Hang <wb-zh951434@alibaba-inc.com> - 0.22.1-1
+- Refer to CentOS Stream bpftrace-0.22.1-1 (vmalik@redhat.com)
+- Add doc sub package (xuchun.shang@linux.alibaba.com)
+
 * Thu Mar 21 2024 mgb01105731 <mgb01105731@alibaba-inc.com> - 0.20.1-1
 - update to 0.20.1