diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index d6a140663..3bec4d347 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -589,7 +589,6 @@
 //#define USE_GPS                                  // Add support for GPS and NTP Server for becoming Stratus 1 Time Source (+3k1 code, +132 bytes RAM)
 //  #define USE_FLOG                               // Add support for GPS logging in OTA's Flash (Experimental) (+2k9 code, +8 bytes RAM)
 //#define USE_HM10                                 // (ESP8266 only) Add support for HM-10 as a BLE-bridge (+9k3 code)
-//#define USE_MI_ESP32                             // (ESP32 only) Add support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
 //#define USE_HRXL                                 // Add support for MaxBotix HRXL-MaxSonar ultrasonic range finders (+0k7)
 //#define USE_TASMOTA_SLAVE                        // Add support for Arduino Uno/Pro Mini via serial interface including flashing (+2k6 code, 64 mem)
   #define USE_TASMOTA_SLAVE_FLASH_SPEED 57600      // Usually 57600 for 3.3V variants and 115200 for 5V variants
@@ -720,6 +719,19 @@
 
 // -- End of general directives -------------------
 
+/*********************************************************************************************\
+ * ESP32 only features
+\*********************************************************************************************/
+
+#ifdef ESP32
+
+//#define USE_ETHERNET                               // Add support for ethernet (Currently fixed for Olimex ESP32-PoE)
+//#define USE_SPI                                    // Add support for hardware SPI
+//#define USE_MI_ESP32                               // Add support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
+//#define USE_WEBCAM                                 // Add support for webcam
+
+#endif
+
 /*********************************************************************************************\
  * Debug features
 \*********************************************************************************************/
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index c973e30f5..1ff178eac 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -598,7 +598,9 @@ void GetFeatures(void)
 
 //  feature6 |= 0x10000000;
 //  feature6 |= 0x20000000;
-//  feature6 |= 0x40000000;
+#ifdef USE_ETHERNET
+  feature6 |= 0x40000000;
+#endif
 #ifdef USE_WEBCAM
   feature6 |= 0x80000000;
 #endif