diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk
index a141497d6c..5a6d574331 100644
--- a/package/libbpf/libbpf.mk
+++ b/package/libbpf/libbpf.mk
@@ -18,14 +18,14 @@ define LIBBPF_BUILD_CMDS
 		-C $(@D)/src
 endef
 
-# bpftrace uses btf_enum64 that was added since kernel 6.0 so we need to
-# update some uapi headers in STAGING_DIR if the toolchain is build with
-# linux-headers < 6.0.
+# bpftrace uses bpf_iter_link_info.task that was added since kernel 6.1
+# so we need to update some uapi headers in STAGING_DIR if the toolchain
+# is build with linux-headers < 6.1.
 # Otherwise bpftrace is broken due to out of date linux/bpf.h installed
 # by the toolchain.
-# https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6089fb325cf737eeb2c4d236c94697112ca860da
-# https://github.com/bpftrace/bpftrace/commit/d4f58382270c21b2c718aa0a6574c105f29e77a9
-ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0),)
+# https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f0d74c4da1f060d2a66976193712a5e6abd361f5
+# https://github.com/bpftrace/bpftrace/commit/7578314df67df6bbdffaf493ff3b4d182b235b34
+ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1),)
 LIBBPF_UPDATE_UAPI_HEADERS = install_uapi_headers UAPIDIR=/usr/include/bpf
 
 define LIBBPF_FIX_STAGING_PC