diff --git a/zimodem/zcommand.ino b/zimodem/zcommand.ino
index 017024c..6954e94 100644
--- a/zimodem/zcommand.ino
+++ b/zimodem/zcommand.ino
@@ -1038,7 +1038,7 @@ ZResult ZCommand::doUpdateFirmware(int vval, uint8_t *vbuf, int vlen, bool isNum

  uint8_t buf[255];
  int bufSize = 254;
-  if((!doWebGetBytes("www.zimmers.net", 80, "/otherprojs/c64net-latest-version.txt", false, buf, &bufSize))||(bufSize<=0))
+  if((!doWebGetBytes(UPDATE_URL, 80, VERSION_FILE, false, buf, &bufSize))||(bufSize<=0))
    return ZERROR;

  if((!isNumber)&&(vlen>2))
@@ -1080,13 +1080,10 @@ ZResult ZCommand::doUpdateFirmware(int vval, uint8_t *vbuf, int vlen, bool isNum
  serial.printf("Updating to %s, wait for modem restart...",buf);
  serial.flush();
  char firmwareName[100];
-#ifdef ZIMODEM_ESP32
-  sprintf(firmwareName,"/otherprojs/guru-firmware-%s.bin",buf);
-#else
-  sprintf(firmwareName,"/otherprojs/c64net-firmware-%s.bin",buf);
-#endif
+  sprintf(firmwareName,UPDATE_FILE,buf);
+
  uint32_t respLength=0;
-  WiFiClient *c = doWebGetStream("www.zimmers.net", 80, firmwareName, false, &respLength);
+  WiFiClient *c = doWebGetStream(UPDATE_URL, 80, firmwareName, false, &respLength);
  if(c==null)
  {
    serial.prints(EOLN);
@@ -3234,4 +3231,3 @@ void ZCommand::loop()
  }
  checkBaudChange();
}
-
diff --git a/zimodem/zimodem.ino b/zimodem/zimodem.ino
index b4ac9bb..1a421a8 100644
--- a/zimodem/zimodem.ino
+++ b/zimodem/zimodem.ino
@@ -33,10 +33,29 @@ const char compile_date[] = __DATE__ " " __TIME__;
# define ZIMODEM_ESP32
#elif defined(ARDUINO_QUANTUM)
# define ZIMODEM_ESP32
+/* Added supported boards: */
+#elif defined(ARDUINO_NodeMCU_32S)
+# define ZIMODEM_ESP32
+# define BOARD_NAME "nodemcu-32s"
+#elif defined(ARDUINO_ESP8266_GENERIC)
+# define ZIMODEM_ESP8266
+# define BOARD_NAME "generic"
+#elif defined(ARDUINO_ESP8266_NODEMCU)
+# define ZIMODEM_ESP8266
+# define BOARD_NAME "nodemcu"
#else
# define ZIMODEM_ESP8266
+# define BOARD_NAME "generic"
#endif

+#if !defined(BOARD_NAME)
+#error Not configured for this board yet.
+#endif
+#define UPDATE_URL   "my.website.com"
+// Must have %s where the version string will go.
+#define UPDATE_FILE  "/zimodem/zimodem.ino."BOARD_NAME"-%s.bin"
+#define VERSION_FILE "/zimodem/zimodem-latest-version.txt"
+

#ifdef ZIMODEM_ESP32
# define DEFAULT_PIN_DCD GPIO_NUM_14
@@ -71,8 +90,8 @@ const char compile_date[] = __DATE__ " " __TIME__;
# define DEFAULT_PIN_RTS 4
# define DEFAULT_PIN_CTS 5 // is 0 for ESP-01, see getDefaultCtsPin() below.
# define DEFAULT_PIN_DCD 2
-# define DEFAULT_FCT FCT_RTSCTS
-# define RS232_INVERTED 1
+# define DEFAULT_FCT FCT_DISABLED
+# define RS232_INVERTED 0
# define debugPrintf doNothing
# define preEOLN(...)
# define echoEOLN(...) serial.prints(EOLN)
@@ -106,7 +125,7 @@ const char compile_date[] = __DATE__ " " __TIME__;
# define DEFAULT_DTR_LOW  HIGH
#endif

-#define DEFAULT_BAUD_RATE 1200
+#define DEFAULT_BAUD_RATE 9600
#define DEFAULT_SERIAL_CONFIG SERIAL_8N1
#define MAX_PIN_NO 50
#define INTERNAL_FLOW_CONTROL_DIV 380
@@ -384,4 +403,4 @@ void loop()
  }
  currMode->loop();
  zclock.tick();
-}
+}