diff --git a/bcc-0.20.0-libbpf-tool-don-t-override-CFLAGS.patch b/bcc-0.20.0-libbpf-tool-don-t-override-CFLAGS.patch
new file mode 100644
index 0000000..c918f85
--- /dev/null
+++ b/bcc-0.20.0-libbpf-tool-don-t-override-CFLAGS.patch
@@ -0,0 +1,25 @@
+From cfa24faa693ce05e2c1bcfbadc938a047272b7f6 Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Wed, 2 Jun 2021 14:23:20 +0200
+Subject: [PATCH] libbpf-tool: don't override CFLAGS
+
+---
+ libbpf-tools/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libbpf-tools/Makefile b/libbpf-tools/Makefile
+index 92dcf5a5..0bf68e50 100644
+--- a/libbpf-tools/Makefile
++++ b/libbpf-tools/Makefile
+@@ -6,7 +6,7 @@ BPFTOOL ?= bin/bpftool
+ LIBBPF_SRC := $(abspath ../src/cc/libbpf/src)
+ LIBBPF_OBJ := $(abspath $(OUTPUT)/libbpf.a)
+ INCLUDES := -I$(OUTPUT) -I../src/cc/libbpf/include/uapi
+-CFLAGS := -g -O2 -Wall
++CFLAGS ?= -g -O2 -Wall
+ INSTALL ?= install
+ prefix ?= /usr/local
+ ARCH := $(shell uname -m | sed 's/x86_64/x86/' | sed 's/aarch64/arm64/' | sed 's/ppc64le/powerpc/' | sed 's/mips.*/mips/')
+-- 
+2.31.1
+
diff --git a/bcc.spec b/bcc.spec
index 1019c0b..cf4917b 100644
--- a/bcc.spec
+++ b/bcc.spec
@@ -27,13 +27,14 @@
 
 Name:           bcc
 Version:        0.20.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BPF Compiler Collection (BCC)
 License:        ASL 2.0
 URL:            https://github.com/iovisor/bcc
 # Upstream now provides a release with the git submodule embedded in it
 Source0:        %{url}/releases/download/v%{version}/%{name}-src-with-submodule.tar.gz
 #Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch0:         %{name}-%{version}-libbpf-tool-don-t-override-CFLAGS.patch
 
 # Arches will be included as upstream support is added and dependencies are
 # satisfied in the respective arches
@@ -226,6 +227,9 @@ install libbpf-tools/tmp-install/bin/* %{buildroot}/%{_sbindir}
 %endif
 
 %changelog
+* Wed Jun 02 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-2
+- Don't override cflags for libbpf-tools
+
 * Thu May 27 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-1
 - Rebase to bcc 0.20.0