diff --git a/src/fdrs_gateway_mqtt.h b/src/fdrs_gateway_mqtt.h
index f38a9d2..799921f 100644
--- a/src/fdrs_gateway_mqtt.h
+++ b/src/fdrs_gateway_mqtt.h
@@ -79,7 +79,7 @@ void reconnect_mqtt(short int attempts, bool silent)
                 sprintf(msg, " Attempt %d/%d", i, attempts);
                 DBG(msg);
             }
-            if ((attempts = !1))
+            if ((attempts != 1))
             {
                 delay(3000);
             }
diff --git a/src/fdrs_gateway_wifi.h b/src/fdrs_gateway_wifi.h
index 1f25bd0..b357b2a 100644
--- a/src/fdrs_gateway_wifi.h
+++ b/src/fdrs_gateway_wifi.h
@@ -1,3 +1,8 @@
+#ifdef USE_ETHERNET
+#ifndef USE_WIFI
+#define USE_WIFI
+#endif
+#endif // USE_ETHERNET
 
 #ifdef USE_WIFI
 #include <WiFiUdp.h>
@@ -7,29 +12,82 @@
 #include <WiFi.h>
 #include <esp_wifi.h>
 #endif
+#ifdef USE_ETHERNET
+#include <ETH.h>
+#endif
+
 // select WiFi SSID configuration
 #if defined(WIFI_SSID)
 #define FDRS_WIFI_SSID WIFI_SSID
-#elif defined (GLOBAL_WIFI_SSID)
+#elif defined(GLOBAL_WIFI_SSID)
 #define FDRS_WIFI_SSID GLOBAL_WIFI_SSID
-#else 
+#else
 // ASSERT("NO WiFi SSID defined! Please define in fdrs_globals.h (recommended) or in fdrs_node_config.h");
-#endif //WIFI_SSID
+#endif // WIFI_SSID
 
-// select WiFi password 
+// select WiFi password
 #if defined(WIFI_PASS)
 #define FDRS_WIFI_PASS WIFI_PASS
-#elif defined (GLOBAL_WIFI_PASS)
+#elif defined(GLOBAL_WIFI_PASS)
 #define FDRS_WIFI_PASS GLOBAL_WIFI_PASS
-#else 
+#else
 // ASSERT("NO WiFi password defined! Please define in fdrs_globals.h (recommended) or in fdrs_node_config.h");
-#endif //WIFI_PASS
+#endif // WIFI_PASS
+#ifdef USE_ETHERNET
+static bool eth_connected = false;
+void WiFiEvent(WiFiEvent_t event)
+{
+  switch (event) {
+    case ARDUINO_EVENT_ETH_START:
+      Serial.println("ETH Started");
+      //set eth hostname here
+      ETH.setHostname("esp32-ethernet");
+      break;
+    case ARDUINO_EVENT_ETH_CONNECTED:
+      Serial.println("ETH Connected");
+      break;
+    case ARDUINO_EVENT_ETH_GOT_IP:
+      Serial.print("ETH MAC: ");
+      Serial.print(ETH.macAddress());
+      Serial.print(", IPv4: ");
+      Serial.print(ETH.localIP());
+      if (ETH.fullDuplex()) {
+        Serial.print(", FULL_DUPLEX");
+      }
+      Serial.print(", ");
+      Serial.print(ETH.linkSpeed());
+      Serial.println("Mbps");
+      eth_connected = true;
+      break;
+    case ARDUINO_EVENT_ETH_DISCONNECTED:
+      Serial.println("ETH Disconnected");
+      eth_connected = false;
+      break;
+    case ARDUINO_EVENT_ETH_STOP:
+      Serial.println("ETH Stopped");
+      eth_connected = false;
+      break;
+    default:
+      break;
+  }
+}
 
+#endif // USE_ETHERNET
 const char *ssid = FDRS_WIFI_SSID;
 const char *password = FDRS_WIFI_PASS;
 
-void begin_wifi(){
-      delay(10);
+void begin_wifi()
+{
+  delay(10);
+#ifdef USE_ETHERNET
+  WiFi.onEvent(WiFiEvent);
+  ETH.begin();
+    while (!eth_connected)
+  {
+    DBG("Connecting ethernet...");
+    delay(500);
+  }
+#else
   WiFi.begin(ssid, password);
   while (WiFi.status() != WL_CONNECTED)
   {
@@ -37,5 +95,6 @@ void begin_wifi(){
     DBG(FDRS_WIFI_SSID);
     delay(500);
   }
+#endif // USE_ETHERNET
 }
 #endif // USE_WIFI