diff --git a/firmware/config/engines/bmw_m52.cpp b/firmware/config/engines/bmw_m52.cpp
new file mode 100644
index 0000000000..615c32aa7b
--- /dev/null
+++ b/firmware/config/engines/bmw_m52.cpp
@@ -0,0 +1,5 @@
+#include "pch.h"
+#include "bmw_m52.h"
+
+void bmwM52() {
+}
diff --git a/firmware/config/engines/bmw_m52.h b/firmware/config/engines/bmw_m52.h
new file mode 100644
index 0000000000..8ff841bb83
--- /dev/null
+++ b/firmware/config/engines/bmw_m52.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void bmwM52();
diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk
index 7ba212e55a..6bc7e49ac4 100644
--- a/firmware/config/engines/engines.mk
+++ b/firmware/config/engines/engines.mk
@@ -2,6 +2,7 @@ ENGINES_INC = $(PROJECT_DIR)/config/engines/mazda/
 
 ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \
 	$(PROJECT_DIR)/config/engines/custom_engine.cpp \
+	$(PROJECT_DIR)/config/engines/bmw_m52.cpp \
 	$(PROJECT_DIR)/config/engines/bmw_m73.cpp \
 	$(PROJECT_DIR)/config/engines/bmw_m73_mre.cpp \
 	$(PROJECT_DIR)/config/engines/f136.cpp \
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index ce47fc5594..9e1b1966fc 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -35,6 +35,7 @@
 
 #include "defaults.h"
 
+#include "bmw_m52.h"
 #include "bmw_m73.h"
 #include "bmw_n73.h"
 
@@ -990,7 +991,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
 		break;
 	case engine_type_e::UNUSED_21:
 	case engine_type_e::UNUSED_65:
-	case engine_type_e::UNUSED_22:
 	case engine_type_e::DODGE_RAM:
 		setDodgeRam1996();
 		break;
@@ -1007,6 +1007,9 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
 	case engine_type_e::SACHS:
 		setSachs();
 		break;
+	case engine_type_e::BMW_M52:
+	  bmwM52();
+    break;
 	case engine_type_e::ET_UNUSED_35:
 	case engine_type_e::TOYOTA_2JZ_GTE_VVTi:
 		setToyota_2jz_vics();
diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h
index e77b5fe7cf..c1259563ac 100644
--- a/firmware/controllers/algo/engine_types.h
+++ b/firmware/controllers/algo/engine_types.h
@@ -64,7 +64,8 @@ enum class engine_type_e : uint16_t {
 	MIATA_NC = 20,
 	UNUSED_21 = 21,
 
-	UNUSED_22 = 22,
+  // BMW e36 etc
+	BMW_M52 = 22,
 
 	/**
 	 * microRusEFI used as Body Control Module BCM BCU
diff --git a/java_console/models/src/main/java/com/rusefi/enums/engine_type_e.java b/java_console/models/src/main/java/com/rusefi/enums/engine_type_e.java
index 66442bbf65..f511e8c1ff 100644
--- a/java_console/models/src/main/java/com/rusefi/enums/engine_type_e.java
+++ b/java_console/models/src/main/java/com/rusefi/enums/engine_type_e.java
@@ -27,7 +27,7 @@ public enum engine_type_e {
 	TEST_ROTARY,
 	MIATA_NC,
 	UNUSED_21,
-	UNUSED_22,
+	BMW_M52,
 	MRE_BODY_CONTROL,
 	BMW_M73_M,
 	PROTEUS_LUA_DEMO,
diff --git a/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/WriteSimulatorConfiguration.java b/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/WriteSimulatorConfiguration.java
index ea7087b93b..0aeb1b2995 100644
--- a/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/WriteSimulatorConfiguration.java
+++ b/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/WriteSimulatorConfiguration.java
@@ -32,6 +32,7 @@ public class WriteSimulatorConfiguration {
             for (int type : new int[]{
                     // [CannedTunes] see 'rusEfiFunctionalTest.cpp' which exports default tunes into binary files for us
                     Fields.engine_type_e_MRE_M111,
+                    Fields.engine_type_e_BMW_M52,
                     Fields.engine_type_e_HONDA_K,
                     Fields.engine_type_e_HELLEN_154_HYUNDAI_COUPE_BK1,
                     Fields.engine_type_e_HELLEN_154_HYUNDAI_COUPE_BK2,
diff --git a/simulator/simulator/rusEfiFunctionalTest.cpp b/simulator/simulator/rusEfiFunctionalTest.cpp
index 0c8fad3e6a..ce44b23049 100644
--- a/simulator/simulator/rusEfiFunctionalTest.cpp
+++ b/simulator/simulator/rusEfiFunctionalTest.cpp
@@ -185,6 +185,7 @@ void rusEfiFunctionalTest(void) {
   // [CannedTunes]
 	for (auto const type : {
 			engine_type_e::MRE_M111,
+			engine_type_e::BMW_M52,
 			engine_type_e::HONDA_K,
 			engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK1,
 			engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2,