diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index a24bd95b5..e8da8e983 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -91,6 +91,9 @@
 #include "modules/DropzoneModule.h"
 #endif
 
+#if defined(HAS_HARDWARE_WATCHDOG)
+#include "watchdog/watchdogThread.h"
+#endif
 /**
  * Create module instances here.  If you are adding a new module, you must 'new' it here (or somewhere else)
  */
@@ -229,6 +232,9 @@ void setupModules()
 #if !MESHTASTIC_EXCLUDE_RANGETEST && !MESHTASTIC_EXCLUDE_GPS
     if (moduleConfig.has_range_test && moduleConfig.range_test.enabled)
         new RangeTestModule();
+#endif
+#if defined(HAS_HARDWARE_WATCHDOG)
+    watchdogThread = new WatchdogThread();
 #endif
     // NOTE! This module must be added LAST because it likes to check for replies from other modules and avoid sending extra
     // acks
diff --git a/src/watchdog/watchdogThread.cpp b/src/watchdog/watchdogThread.cpp
new file mode 100644
index 000000000..ff329f62b
--- /dev/null
+++ b/src/watchdog/watchdogThread.cpp
@@ -0,0 +1,37 @@
+#include "watchdogThread.h"
+#include "configuration.h"
+
+#ifdef HAS_HARDWARE_WATCHDOG
+WatchdogThread *watchdogThread;
+
+WatchdogThread::WatchdogThread() : OSThread("Watchdog")
+{
+    setup();
+}
+
+void WatchdogThread::feedDog(void)
+{   
+    digitalWrite(HARDWARE_WATCHDOG_DONE, HIGH);
+    delay(1);
+    digitalWrite(HARDWARE_WATCHDOG_DONE, LOW);
+}
+
+int32_t WatchdogThread::runOnce()
+{
+    LOG_DEBUG("Feeding hardware watchdog");
+    feedDog();
+    return HARDWARE_WATCHDOG_TIMEOUT_MS;
+}
+
+bool WatchdogThread::setup()
+{
+    LOG_DEBUG("init hardware watchdog");
+    pinMode(HARDWARE_WATCHDOG_WAKE, INPUT);
+    pinMode(HARDWARE_WATCHDOG_DONE, OUTPUT);
+    delay(1);
+    digitalWrite(HARDWARE_WATCHDOG_DONE, LOW);
+    delay(1);
+    feedDog();
+    return true;
+}
+#endif
\ No newline at end of file
diff --git a/src/watchdog/watchdogThread.h b/src/watchdog/watchdogThread.h
new file mode 100644
index 000000000..5756afa46
--- /dev/null
+++ b/src/watchdog/watchdogThread.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <stdint.h>
+#include "concurrency/OSThread.h"
+
+#ifdef HAS_HARDWARE_WATCHDOG
+class WatchdogThread : private concurrency::OSThread
+{
+  public:
+
+    WatchdogThread();
+    void feedDog(void);
+    virtual bool setup();
+    virtual int32_t runOnce() override;
+
+};
+
+extern WatchdogThread *watchdogThread;
+#endif
diff --git a/variants/nrf52840/heltec_mesh_solar/variant.h b/variants/nrf52840/heltec_mesh_solar/variant.h
index f05668e56..02cf724c3 100644
--- a/variants/nrf52840/heltec_mesh_solar/variant.h
+++ b/variants/nrf52840/heltec_mesh_solar/variant.h
@@ -39,15 +39,15 @@ extern "C" {
 #define NUM_ANALOG_INPUTS (1)
 #define NUM_ANALOG_OUTPUTS (0)
 
-#define PIN_LED1 (0 + 4)  // green (confirmed on 1.0 board)
+#define PIN_LED1 (32 + 15)  // green (confirmed on 1.0 board)
 #define LED_BLUE PIN_LED1 // fake for bluefruit library
 #define LED_GREEN PIN_LED1
 #define LED_STATE_ON 0 // State when LED is lit
 
-#define HAS_NEOPIXEL                         // Enable the use of neopixels
-#define NEOPIXEL_COUNT 1                     // How many neopixels are connected
-#define NEOPIXEL_DATA (32 + 15)              // gpio pin used to send data to the neopixels
-#define NEOPIXEL_TYPE (NEO_GRB + NEO_KHZ800) // type of neopixels in use
+// #define HAS_NEOPIXEL                         // Enable the use of neopixels
+// #define NEOPIXEL_COUNT 1                     // How many neopixels are connected
+// #define NEOPIXEL_DATA (32 + 15)              // gpio pin used to send data to the neopixels
+// #define NEOPIXEL_TYPE (NEO_GRB + NEO_KHZ800) // type of neopixels in use
 
 /*
  * Buttons
@@ -59,8 +59,8 @@ extern "C" {
 /*
 No longer populated on PCB
 */
-#define PIN_SERIAL2_RX (0 + 9)
-#define PIN_SERIAL2_TX (0 + 10)
+#define PIN_SERIAL2_RX (-1)
+#define PIN_SERIAL2_TX (-1)
 
 /*
  * I2C
@@ -137,6 +137,12 @@ No longer populated on PCB
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
 
+// Hardware watchdog
+#define HAS_HARDWARE_WATCHDOG
+#define HARDWARE_WATCHDOG_DONE (0 + 9)
+#define HARDWARE_WATCHDOG_WAKE (0 + 10)
+#define HARDWARE_WATCHDOG_TIMEOUT_MS (6*60*1000) // 6 minute watchdog
+
 #define BQ4050_SDA_PIN (32 + 1)                // I2C data line pin
 #define BQ4050_SCL_PIN (32 + 0)                // I2C clock line pin
 #define BQ4050_EMERGENCY_SHUTDOWN_PIN (32 + 3) // Emergency shutdown pin