diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h
index d64b9c31ba..29512c5bbb 100644
--- a/firmware/config/stm32f4ems/efifeatures.h
+++ b/firmware/config/stm32f4ems/efifeatures.h
@@ -56,6 +56,11 @@
  */
 #define EFI_TUNER_STUDIO TRUE
 
+/**
+ * Bluetooth UART setup support.
+ */
+#define EFI_BLUETOOTH_SETUP FALSE
+
 /**
  * TunerStudio debug output
  */
diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
index 8f3e603417..d0377c59a3 100644
--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@@ -73,6 +73,7 @@
 #include "console_io.h"
 #include "crc.h"
 #include "fl_protocol.h"
+#include "bluetooth.h"
 
 #include <string.h>
 #include "engine_configuration.h"
@@ -167,6 +168,13 @@ static void setTsSpeed(int value) {
 	printTsStats();
 }
 
+#if EFI_BLUETOOTH_SETUP || defined(__DOXYGEN__)
+// Bluetooth HC-06 module initialization start (it waits for disconnect and then communicates to the module)
+static void bluetoothHC06(const char *baudRate, const char *name, const char *pinCode) {
+	bluetoothStart(&tsChannel, BLUETOOTH_HC_06, baudRate, name, pinCode);
+}
+#endif  /* EFI_BLUETOOTH_SETUP */
+
 void tunerStudioDebug(const char *msg) {
 #if EFI_TUNER_STUDIO_VERBOSE || defined(__DOXYGEN__)
 	scheduleMsg(&tsLogger, "%s", msg);
@@ -452,6 +460,10 @@ void runBinaryProtocolLoop(ts_channel_s *tsChannel, bool isConsoleRedirect) {
 
 		if (received != 1) {
 //			tunerStudioError("ERROR: no command");
+#if EFI_BLUETOOTH_SETUP || defined(__DOXYGEN__)
+			// assume there's connection loss and notify the bluetooth init code
+			bluetoothSoftwareDisconnectNotify();
+#endif  /* EFI_BLUETOOTH_SETUP */
 			continue;
 		}
 		onDataArrived();
@@ -828,6 +840,13 @@ void startTunerStudioConnectivity(void) {
 	addConsoleAction("tsinfo", printTsStats);
 	addConsoleAction("reset_ts", resetTs);
 	addConsoleActionI("set_ts_speed", setTsSpeed);
+	
+#if EFI_BLUETOOTH_SETUP || defined(__DOXYGEN__)
+	// Usage:   "bluetooth_hc06 <baud> <name> <pincode>"
+	// Example: "bluetooth_hc06 38400 rusefi 1234"
+	addConsoleActionSSS("bluetooth_hc06", bluetoothHC06);
+	addConsoleAction("bluetooth_cancel", bluetoothCancel);
+#endif /* EFI_BLUETOOTH_SETUP */
 
 	chThdCreateStatic(tsThreadStack, sizeof(tsThreadStack), NORMALPRIO, (tfunc_t)tsThreadEntryPoint, NULL);
 }
diff --git a/firmware/console/binary/tunerstudio.mk b/firmware/console/binary/tunerstudio.mk
index 6620966dd2..0126d71c85 100644
--- a/firmware/console/binary/tunerstudio.mk
+++ b/firmware/console/binary/tunerstudio.mk
@@ -1,3 +1,4 @@
 
 TUNERSTUDIO_SRC_CPP = $(PROJECT_DIR)/console/binary/tunerstudio_io.cpp \
-	$(PROJECT_DIR)/console/binary/tunerstudio.cpp 
+	$(PROJECT_DIR)/console/binary/tunerstudio.cpp \
+	$(PROJECT_DIR)/console/binary/bluetooth.cpp