diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d37926e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ChibiOS"]
+	path = ChibiOS
+	url = git@github.com:edy555/ChibiOS.git
diff --git a/ChibiOS b/ChibiOS
new file mode 160000
index 0000000..15a5b73
--- /dev/null
+++ b/ChibiOS
@@ -0,0 +1 @@
+Subproject commit 15a5b731358f52c95c555a3593c3850e6120e7b8
diff --git a/Makefile b/Makefile
index 208d1df..03e87b0 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,8 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../ChibiOS-RT
+#CHIBIOS = ../ChibiOS-RT
+CHIBIOS = ChibiOS
 PROJ = .
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk