diff --git a/.gitignore b/.gitignore
index 21f043b..4e59316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /bpftrace-0.9.1.tar.gz
 /bpftrace-0.9.2.tar.gz
 /bpftrace-0.9.3.tar.gz
+/bpftrace-0.9.4.tar.gz
diff --git a/0001-Add-missing-string-include-to-btf.h.patch b/0001-Add-missing-string-include-to-btf.h.patch
new file mode 100644
index 0000000..b10988a
--- /dev/null
+++ b/0001-Add-missing-string-include-to-btf.h.patch
@@ -0,0 +1,37 @@
+From 145041ec75eae1e58fcd3f784964303fb75c16d5 Mon Sep 17 00:00:00 2001
+From: Augusto Caringi <acaringi@redhat.com>
+Date: Wed, 5 Feb 2020 15:24:21 +0100
+Subject: [PATCH] Add missing <string> include to btf.h
+
+The missing include was causing building problems with gcc 10.0.1:
+
+In file included from
+/builddir/build/BUILD/bpftrace-0.9.4/src/btf.cpp:1:
+/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:26:8: error: 'string' in
+namespace 'std' does not name a type
+   26 |   std::string c_def(std::unordered_set<std::string>& set);
+      |        ^~~~~~
+/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:7:1: note: 'std::string'
+is defined in header '<string>'; did you forget to '#include <string>'?
+    6 | #include <unordered_set>
+  +++ |+#include <string>
+    7 |
+---
+ src/btf.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/btf.h b/src/btf.h
+index 05b56ff..8856bfc 100644
+--- a/src/btf.h
++++ b/src/btf.h
+@@ -1,6 +1,7 @@
+ #pragma once
+ 
+ #include <linux/types.h>
++#include <string>
+ #include <unistd.h>
+ #include <unordered_set>
+ 
+-- 
+2.21.1
+
diff --git a/bpftrace.spec b/bpftrace.spec
index f11ca68..9c342c5 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,10 +1,11 @@
 Name:           bpftrace
-Version:        0.9.3
-Release:        2%{?dist}
+Version:        0.9.4
+Release:        1%{?dist}
 Summary:        High-level tracing language for Linux eBPF
 License:        ASL 2.0
 
 URL:            https://github.com/iovisor/bpftrace
+Patch0:         0001-Add-missing-string-include-to-btf.h.patch
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 # Arches will be included as upstream support is added and dependencies are
@@ -74,6 +75,9 @@ mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
 
 
 %changelog
+* Thu Feb 06 2020 Augusto Caringi <acaringi@redhat.com> - 0.9.4-1
+- Rebased to version 0.9.4
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 5b42aef..0db1bc7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bpftrace-0.9.3.tar.gz) = 49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
+SHA512 (bpftrace-0.9.4.tar.gz) = d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da