diff --git a/.gitmodules b/.gitmodules
index 841626523..a23dfd76b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,3 +11,6 @@
 	path = external/libwally-core
 	url = https://github.com/ElementsProject/libwally-core.git
 	ignore = dirty
+[submodule "external/gheap"]
+	path = external/gheap
+	url = https://github.com/valyala/gheap
diff --git a/external/Makefile b/external/Makefile
index 66a3e1354..5bd366510 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -1,6 +1,7 @@
 SUBMODULES =					\
 	external/libsodium			\
 	external/libwally-core			\
+	external/gheap				\
 	external/jsmn				\
 	external/libbacktrace
 
@@ -19,8 +20,9 @@ LIBWALLY_HEADERS := external/libwally-core/include/wally_bip32.h		\
 LIBSECP_HEADERS := external/libwally-core/src/secp256k1/include/secp256k1_ecdh.h		\
 		external/libwally-core/src/secp256k1/include/secp256k1.h
 JSMN_HEADERS := external/jsmn/jsmn.h
+GHEAP_HEADERS := external/gheap/gheap.h external/gheap/galgorithm.h
 
-EXTERNAL_HEADERS := $(LIBSODIUM_HEADERS) $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) $(JSMN_HEADERS)
+EXTERNAL_HEADERS := $(LIBSODIUM_HEADERS) $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) $(JSMN_HEADERS) $(GHEAP_HEADERS)
 EXTERNAL_LIBS := ${TARGET_DIR}/libwallycore.a ${TARGET_DIR}/libsecp256k1.a ${TARGET_DIR}/libjsmn.a ${TARGET_DIR}/libbacktrace.a
 
 EXTERNAL_INCLUDE_FLAGS :=					\
@@ -28,6 +30,7 @@ EXTERNAL_INCLUDE_FLAGS :=					\
 	-I external/libwally-core/src/secp256k1/include/	\
 	-I external/jsmn/					\
 	-I external/libbacktrace/				\
+	-I external/gheap/					\
 	-I ${TARGET_DIR}/libbacktrace-build
 
 ifneq ($(HAVE_GOOD_LIBSODIUM),1)
diff --git a/external/gheap b/external/gheap
new file mode 160000
index 000000000..67fc83bc9
--- /dev/null
+++ b/external/gheap
@@ -0,0 +1 @@
+Subproject commit 67fc83bc953324f4759e52951921d730d7e65099