diff --git a/Tools/ardupilotwaf/static_linking.py b/Tools/ardupilotwaf/static_linking.py
new file mode 100644
index 0000000000..3402ee0b6c
--- /dev/null
+++ b/Tools/ardupilotwaf/static_linking.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""
+WAF Tool to force programs to be statically linked
+"""
+
+from waflib.TaskGen import after_method, feature
+
+@feature('static_linking')
+@after_method('apply_link')
+def force_static_linking(self):
+	env = self.link_task.env
+	env.STLIB += env.LIB
+	env.LIB = []
+	env.STLIB_MARKER = '-static'
+	env.SHLIB_MARKER = ''