diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..2de1234
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "ChibiOS"]
+	path = ChibiOS
+	url = https://github.com/ChibiOS/ChibiOS
+	branch = stable_20.3.x
diff --git a/ChibiOS b/ChibiOS
new file mode 160000
index 0000000..aac09d3
--- /dev/null
+++ b/ChibiOS
@@ -0,0 +1 @@
+Subproject commit aac09d3da8b019cf5f6ac4366200b6d2a1e26fc7
diff --git a/Makefile b/Makefile
index 63f1473..5bfe079 100644
--- a/Makefile
+++ b/Makefile
@@ -82,9 +82,9 @@ endif
 
 # Define project name here
 PROJECT = ch
-CHIBIOSLUA    ?= $(shell pwd)
+CHIBIOSLUA    ?= .
 # Imported source files and paths
-CHIBIOS = $(CHIBIOSLUA)/../ChibiOS
+CHIBIOS = $(CHIBIOSLUA)/ChibiOS
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
 include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk