diff --git a/.gitmodules b/.gitmodules
index 03d9b528f9..edf2a8f529 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "modules/uavcan"]
 	path = modules/uavcan
 	url = git://github.com/diydrones/uavcan.git
+[submodule "modules/waf"]
+	path = modules/waf
+	url = git://github.com/diydrones/waf.git
diff --git a/modules/waf b/modules/waf
new file mode 160000
index 0000000000..d2ade00ef8
--- /dev/null
+++ b/modules/waf
@@ -0,0 +1 @@
+Subproject commit d2ade00ef86f5024317ef48ae0e30cff51c8f3dd