diff --git a/Grbl_Esp32/Grbl_Esp32.ino b/Grbl_Esp32/Grbl_Esp32.ino
index c761a647..fd073934 100644
--- a/Grbl_Esp32/Grbl_Esp32.ino
+++ b/Grbl_Esp32/Grbl_Esp32.ino
@@ -48,7 +48,12 @@ void setup() {
   grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Compiled with ESP32 SDK:%s", ESP.getSdkVersion()); // print the SDK version
 
   #ifdef MACHINE_NAME // show the map name at startup
-		grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Using cpu_map:%s", MACHINE_NAME);
+    #ifdef MACHINE_EXTRA
+       #define MACHINE_STRING MACHINE_NAME MACHINE_EXTRA
+    #else
+      #define MACHINE_STRING MACHINE_NAME
+    #endif
+		grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Using machine:%s", MACHINE_STRING);
   #endif
 	
   settings_init(); // Load Grbl settings from EEPROM  
diff --git a/Grbl_Esp32/Machines/add_esc_spindle.h b/Grbl_Esp32/Machines/add_esc_spindle.h
index 33426a52..901393ea 100644
--- a/Grbl_Esp32/Machines/add_esc_spindle.h
+++ b/Grbl_Esp32/Machines/add_esc_spindle.h
@@ -8,6 +8,9 @@
 // This uses a Brushless DC Hobby motor as a spindle motor.  See:
 //   https://github.com/bdring/Grbl_Esp32/wiki/BESC-Spindle-Feature
 
+// MACHINE_EXTRA is appended to MACHINE_NAME for startup message display
+#define MACHINE_EXTRA "_ESC_SPINDLE"
+
 #define SHOW_EXTENDED_SETTINGS
 
 #define SPINDLE_PWM_BIT_PRECISION 16   // 16 bit recommended for ESC (don't change)