diff --git a/libraries/ESP8266mDNS/examples/OTA-mDNS-SPIFFS/OTA-mDNS-SPIFFS.ino b/libraries/ESP8266mDNS/examples/OTA-mDNS-SPIFFS/OTA-mDNS-SPIFFS.ino
index 332112b74..762f20303 100644
--- a/libraries/ESP8266mDNS/examples/OTA-mDNS-SPIFFS/OTA-mDNS-SPIFFS.ino
+++ b/libraries/ESP8266mDNS/examples/OTA-mDNS-SPIFFS/OTA-mDNS-SPIFFS.ino
@@ -17,7 +17,7 @@
  * @brief mDNS and OTA Constants
  * @{
  */
-#define HOSTNAME "ESP8266-ota" ///< Hostename 
+#define HOSTNAME "ESP8266-OTA-" ///< Hostename. The setup function adds the Chip ID at the end.
 #define APORT 8266 ///< Port for OTA update
 /// @}
 
@@ -207,7 +207,11 @@ void setup()
   Serial.println(ESP.getChipId(), HEX);
 
   // Set Hostname.
-  WiFi.hostname(HOSTNAME);
+  String hostname(HOSTNAME);
+  hostname += String(ESP.getChipId(), HEX);
+  WiFi.hostname(hostname);
+
+  // Print hostname.
   Serial.print("hostname: ");
   Serial.println(WiFi.hostname());
 
@@ -296,7 +300,7 @@ void setup()
   }
 
   // Initialize mDNS service.
-  MDNS.begin(HOSTNAME);
+  MDNS.begin(hostname.c_str());
 
   // ... Add OTA service.
   MDNS.addService("arduino", "tcp", APORT);
diff --git a/tools/espota.py b/tools/espota.py
index 7e26b5cfb..b73e19ea6 100755
--- a/tools/espota.py
+++ b/tools/espota.py
@@ -123,7 +123,7 @@ def parser():
 	group.add_option("-p", "--port",
 		dest = "esp_port",
 		type = "int",
-		help = "ESP8266 ota Port.",
+		help = "ESP8266 ota Port. Default 8266",
 		default = 8266
 	)
 	parser.add_option_group(group)