diff --git a/.gitmodules b/.gitmodules
index de17183992..0309155d47 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "tools/asm-differ"]
 	path = tools/asm-differ
 	url = https://github.com/simonlindholm/asm-differ.git
+[submodule "tools/ZAP2"]
+	path = tools/ZAP2
+	url = https://github.com/NEstelami/ZAP2.git
diff --git a/tools/ZAP2 b/tools/ZAP2
new file mode 160000
index 0000000000..ba00137cf7
--- /dev/null
+++ b/tools/ZAP2
@@ -0,0 +1 @@
+Subproject commit ba00137cf7ef67477ccae2211bf541013b197367