diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4cdddd9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/shiftos/
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4aba399..e57e05c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -191,3 +191,6 @@
 
 # Inherit the proprietary files
 include vendor/shift/otter/BoardConfigVendor.mk
+
+# Include ShiftOS specific BoardConfig if existing
+-include device/shift/otter/shiftos/BoardConfig.mk