diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..6af50f5c731bd14511b4b786c7dd8cb746a16506
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "external/chibios"]
+	path = external/chibios
+	url = https://github.com/ChibiOS/ChibiOS
+[submodule "external/chibios-contrib"]
+	path = external/chibios-contrib
+	url = https://github.com/ChibiOS/ChibiOS-Contrib
diff --git a/external/chibios b/external/chibios
new file mode 160000
index 0000000000000000000000000000000000000000..0dc527aeb4c24034c1dede76271a81278601a803
--- /dev/null
+++ b/external/chibios
@@ -0,0 +1 @@
+Subproject commit 0dc527aeb4c24034c1dede76271a81278601a803
diff --git a/external/chibios-contrib b/external/chibios-contrib
new file mode 160000
index 0000000000000000000000000000000000000000..aa1299657cf9f6b163dba973253589e47fad24ed
--- /dev/null
+++ b/external/chibios-contrib
@@ -0,0 +1 @@
+Subproject commit aa1299657cf9f6b163dba973253589e47fad24ed