diff --git a/.gitmodules b/.gitmodules
index f717b78..7d1217c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,7 @@
 	path = bme680-air-meter
 	url = https://git.shimatta.de/pcb/bme680-air-meter
 	branch = master
+[submodule "bme680-driver-fork"]
+	path = bme680-driver-fork
+	url = https://git.shimatta.de/mhu/bme680-driver-fork
+	branch = master
diff --git a/Makefile b/Makefile
index 5844f25..afc7ccf 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ mapfile = memmap
 
 ##Custom Files###
 
-CFILES += BME680_driver/bme680.c
+CFILES += bme680-driver-fork/bme680.c
 
 
 ###################################################################################
diff --git a/bme680-driver-fork b/bme680-driver-fork
new file mode 160000
index 0000000..617908c
--- /dev/null
+++ b/bme680-driver-fork
@@ -0,0 +1 @@
+Subproject commit 617908cbd42082ea23c38c73cfc9fd0dcd1789b5
diff --git a/main.c b/main.c
index 73b4a23..a1dfbc3 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
 #include <stm32f0xx.h>
-#include "BME680_driver/bme680.h"
+#include "bme680-driver-fork/bme680.h"
 
 unsigned int i = 0x12345678;
 unsigned char c = 2;