diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 7778f78e9..5dec1a7ef 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -4675,7 +4675,16 @@ Sigma_Exit:
           // pause the print and ask the user to upgrade the firmware.
           show_upgrade_dialog_if_version_newer(++ strchr_pointer);
       } else {
-          SERIAL_PROTOCOLRPGM(MSG_M115_REPORT);
+          SERIAL_ECHOPGM("FIRMWARE_NAME:Prusa-Firmware ");
+          SERIAL_ECHORPGM(FW_VERSION_STR_P());
+          SERIAL_ECHOPGM(" based on Marlin FIRMWARE_URL:https://github.com/prusa3d/Prusa-Firmware PROTOCOL_VERSION:");
+          SERIAL_ECHOPGM(PROTOCOL_VERSION);
+          SERIAL_ECHOPGM(" MACHINE_TYPE:");
+          SERIAL_ECHOPGM(CUSTOM_MENDEL_NAME); 
+          SERIAL_ECHOPGM(" EXTRUDER_COUNT:"); 
+          SERIAL_ECHOPGM(STRINGIFY(EXTRUDERS)); 
+          SERIAL_ECHOPGM(" UUID:"); 
+          SERIAL_ECHOLNPGM(MACHINE_UUID);
       }
       break;
 /*    case 117: // M117 display message
diff --git a/Firmware/langtool.pl b/Firmware/langtool.pl
index ac9dee72d..9d95a60e1 100644
--- a/Firmware/langtool.pl
+++ b/Firmware/langtool.pl
@@ -40,10 +40,10 @@ sub parselang
     	# Trim whitespaces from both sides
     	$value =~ s/^\s+|\s+$//g;
 		#$string =~ s/" MACHINE_NAME "/Prusa i3/;
-		$value =~ s/" FIRMWARE_URL "/https:\/\/github.com\/prusa3d\/Prusa-i3-Plus\//;
-		$value =~ s/" PROTOCOL_VERSION "/1.0/;
-		$value =~ s/" STRINGIFY\(EXTRUDERS\) "/1/;
-		$value =~ s/" MACHINE_UUID "/00000000-0000-0000-0000-000000000000/;
+		#$value =~ s/" FIRMWARE_URL "/https:\/\/github.com\/prusa3d\/Prusa-Firmware\//;
+		#$value =~ s/" PROTOCOL_VERSION "/1.0/;
+		#$value =~ s/" STRINGIFY\(EXTRUDERS\) "/1/;
+		#$value =~ s/" MACHINE_UUID "/00000000-0000-0000-0000-000000000000/;
 		${$out}{$symbol} = { value=>$value, %$modifiers };
 	}
 	return $out;
diff --git a/Firmware/language.h b/Firmware/language.h
index 32ec21bb5..cff631d8b 100644
--- a/Firmware/language.h
+++ b/Firmware/language.h
@@ -3,33 +3,14 @@
 
 #define PROTOCOL_VERSION "1.0"
 
-#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
-  #define MACHINE_NAME "Ultimaker"
-  #define FIRMWARE_URL "http://firmware.ultimaker.com"
-#elif MB(RUMBA)
-  #define MACHINE_NAME "Rumba"
-  #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin"
-#elif MB(3DRAG)
-  #define MACHINE_NAME "3Drag"
-  #define FIRMWARE_URL "http://3dprint.elettronicain.it/"
-#elif MB(5DPRINT)
-  #define MACHINE_NAME "Makibox"
-  #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin"
-#elif MB(SAV_MKI)
-  #define MACHINE_NAME "SAV MkI"
-  #define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
-#else
-  #ifdef CUSTOM_MENDEL_NAME
+#ifdef CUSTOM_MENDEL_NAME
    // #define CUSTOM_MENDEL_NAME CUSTOM_MENDEL_NAME
-  #else
+#else
     #define MACHINE_NAME "Mendel"
-  #endif
-
-// Default firmware set to Mendel
-  #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin"
 #endif
 
 
+
 #ifndef MACHINE_UUID
    #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
 #endif
diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp
index a141ed28a..75c4162cc 100644
--- a/Firmware/language_all.cpp
+++ b/Firmware/language_all.cpp
@@ -1640,11 +1640,6 @@ const char * const MSG_M109_INVALID_EXTRUDER_LANG_TABLE[1] PROGMEM = {
 	MSG_M109_INVALID_EXTRUDER_EN
 };
 
-const char MSG_M115_REPORT_EN[] PROGMEM = "FIRMWARE_NAME:Marlin V1.0.2; Sprinter/grbl mashup for gen6 FIRMWARE_URL:https://github.com/prusa3d/Prusa-i3-Plus/ PROTOCOL_VERSION:1.0 MACHINE_TYPE:" CUSTOM_MENDEL_NAME " EXTRUDER_COUNT:1 UUID:00000000-0000-0000-0000-000000000000\n";
-const char * const MSG_M115_REPORT_LANG_TABLE[1] PROGMEM = {
-	MSG_M115_REPORT_EN
-};
-
 const char MSG_M117_V2_CALIBRATION_EN[] PROGMEM = "M117 First layer cal.";
 const char MSG_M117_V2_CALIBRATION_CZ[] PROGMEM = "M117 Kal. prvni vrstvy";
 const char MSG_M117_V2_CALIBRATION_IT[] PROGMEM = "M117 Cal. primo layer.";
diff --git a/Firmware/language_all.h b/Firmware/language_all.h
index 3451253d6..950f6952f 100644
--- a/Firmware/language_all.h
+++ b/Firmware/language_all.h
@@ -308,8 +308,6 @@ extern const char* const MSG_M105_INVALID_EXTRUDER_LANG_TABLE[1];
 #define MSG_M105_INVALID_EXTRUDER LANG_TABLE_SELECT_EXPLICIT(MSG_M105_INVALID_EXTRUDER_LANG_TABLE, 0)
 extern const char* const MSG_M109_INVALID_EXTRUDER_LANG_TABLE[1];
 #define MSG_M109_INVALID_EXTRUDER LANG_TABLE_SELECT_EXPLICIT(MSG_M109_INVALID_EXTRUDER_LANG_TABLE, 0)
-extern const char* const MSG_M115_REPORT_LANG_TABLE[1];
-#define MSG_M115_REPORT LANG_TABLE_SELECT_EXPLICIT(MSG_M115_REPORT_LANG_TABLE, 0)
 extern const char* const MSG_M117_V2_CALIBRATION_LANG_TABLE[LANG_NUM];
 #define MSG_M117_V2_CALIBRATION LANG_TABLE_SELECT(MSG_M117_V2_CALIBRATION_LANG_TABLE)
 extern const char* const MSG_M119_REPORT_LANG_TABLE[1];
diff --git a/Firmware/language_common.h b/Firmware/language_common.h
index 61c223dab..aaf869fd8 100644
--- a/Firmware/language_common.h
+++ b/Firmware/language_common.h
@@ -26,7 +26,6 @@ define MSG_FILE_PRINTED                    "Done printing file"
 +define MSG_M221_INVALID_EXTRUDER           "M221 Invalid extruder "
 +define MSG_ERR_NO_THERMISTORS              "No thermistors - no temperature"
 +define MSG_M109_INVALID_EXTRUDER           "M109 Invalid extruder "
-+define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin V1.0.2; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" CUSTOM_MENDEL_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
 define MSG_COUNT_X                         " Count X: "
 +define MSG_ERR_KILLED                      "Printer halted. kill() called!"
 +define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h
index 81d6fa059..9315ae680 100644
--- a/Firmware/language_cz.h
+++ b/Firmware/language_cz.h
@@ -129,7 +129,6 @@
 #define MSG_HEATING_COMPLETE                "Zahrivani OK."
 #define MSG_BED_HEATING                     "Zahrivani bed"
 #define MSG_BED_DONE                        "Bed OK."
-#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin V1.0.2; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" CUSTOM_MENDEL_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
 #define MSG_RESEND                          "Resend: "
diff --git a/Firmware/language_de.h b/Firmware/language_de.h
index eb9d306b2..c4ffb5515 100644
--- a/Firmware/language_de.h
+++ b/Firmware/language_de.h
@@ -117,7 +117,6 @@
 	+ #define(length = 20) MSG_HEATING_COMPLETE   "Aufwaermen OK"
 	+ #define MSG_BED_HEATING                     "Bett aufwaermen"
 	+ #define MSG_BED_DONE                        "Bett OK"
-	+ #define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin V1.0.2; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" CUSTOM_MENDEL_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
 	+ #define MSG_ERR_KILLED                      "Printer gestoppt. kill() aufgerufen!"
 	+ #define MSG_ERR_STOPPED                     "Drucker aufgrund von Fehlern gestoppt. Fehler beheben und mit M999 neu starten. (Temperatur wird zurueckgesetzt. Nach dem Neustart neu einstellen!)"
 	+ #define MSG_RESEND                          "Wiederholen: "
diff --git a/Firmware/language_en.h b/Firmware/language_en.h
index b00afaf91..c902ce158 100644
--- a/Firmware/language_en.h
+++ b/Firmware/language_en.h
@@ -129,7 +129,6 @@
 #define(length=20) MSG_HEATING_COMPLETE     "Heating done."
 #define MSG_BED_HEATING                     "Bed Heating"
 #define MSG_BED_DONE                        "Bed done"
-#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin V1.0.2; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" CUSTOM_MENDEL_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
 #define MSG_RESEND                          "Resend: "
diff --git a/Firmware/language_es.h b/Firmware/language_es.h
index d0228c8f5..505351049 100644
--- a/Firmware/language_es.h
+++ b/Firmware/language_es.h
@@ -97,7 +97,6 @@
 #define MSG_M221_INVALID_EXTRUDER           "M221 Invalid extruder "
 #define MSG_ERR_NO_THERMISTORS              "No thermistors - no temperature"
 #define MSG_M109_INVALID_EXTRUDER           "M109 Invalid extruder "
-#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin V1.0.2; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" CUSTOM_MENDEL_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
 #define MSG_RESEND                          "Resend: "
diff --git a/Firmware/language_it.h b/Firmware/language_it.h
index ffc617dcb..ff15c6331 100644
--- a/Firmware/language_it.h
+++ b/Firmware/language_it.h
@@ -106,7 +106,6 @@
 #define MSG_M221_INVALID_EXTRUDER           "M221 Invalid extruder "
 #define MSG_ERR_NO_THERMISTORS              "No thermistors - no temperature"
 #define MSG_M109_INVALID_EXTRUDER           "M109 Invalid extruder "
-#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin V1.0.2; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" CUSTOM_MENDEL_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
 #define MSG_RESEND                          "Resend: "
diff --git a/Firmware/language_pl.h b/Firmware/language_pl.h
index fa147b64d..9df27e32d 100644
--- a/Firmware/language_pl.h
+++ b/Firmware/language_pl.h
@@ -96,7 +96,6 @@
 #define MSG_M221_INVALID_EXTRUDER           "M221 Invalid extruder "
 #define MSG_ERR_NO_THERMISTORS              "No thermistors - no temperature"
 #define MSG_M109_INVALID_EXTRUDER           "M109 Invalid extruder "
-#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin V1.0.2; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" CUSTOM_MENDEL_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
 #define MSG_RESEND                          "Resend: "