diff --git a/.gitignore b/.gitignore
index 66c85a3..54f4ec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /dwarves-1.19.tar.xz
 /dwarves-1.20.tar.xz
 /dwarves-1.21.tar.xz
+/0001-btf-Remove-ftrace-filter.patch
diff --git a/dwarves.spec b/dwarves.spec
index 0a38b56..e56eb3a 100644
--- a/dwarves.spec
+++ b/dwarves.spec
@@ -3,11 +3,12 @@
 
 Name: dwarves
 Version: 1.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Summary: Debugging Information Manipulation Tools (pahole & friends)
 URL: http://acmel.wordpress.com
 Source: http://fedorapeople.org/~acme/dwarves/%{name}-%{version}.tar.xz
+Patch1: 0001-btf-Remove-ftrace-filter.patch
 Requires: %{libname}%{libver} = %{version}-%{release}
 BuildRequires: gcc
 BuildRequires: cmake >= 2.8.12
@@ -65,6 +66,7 @@ Debugging information processing library development files.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %cmake -DCMAKE_BUILD_TYPE=Release .
@@ -134,6 +136,9 @@ rm -Rf %{buildroot}
 %{_libdir}/%{libname}_reorganize.so
 
 %changelog
+* Mon May 10 2021 Arnaldo Carvalho de Melo <acme@redhat.com> - 1.21-2 
+- Backport 0001-btf-Remove-ftrace-filter.patch from upstream
+
 * Fri Apr 9 2021 Arnaldo Carvalho de Melo <acme@redhat.com> - 1.21-1
 - New release: v1.21
 - DWARF loader:
diff --git a/sources b/sources
index c8f719b..043ba3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dwarves-1.21.tar.xz) = 69f510025f5790a004c356546f7d92996ad84c4ff1636876b48f1c7d81bf66c83da70f11a1912d65b46f81bea79418782021396a018e74baae5cad9221af14e1
+SHA512 (0001-btf-Remove-ftrace-filter.patch) = b210c9013eeb880b68aa50e46957559362d258a6dba918dc3c791528616631bde609e4aa48c1bce055b49eff4c163c7f4e48072d066b339cc3b98d266f7d2c5e