diff --git a/include/espspi/Ethernet.h b/include/espspi/Ethernet.h
new file mode 100644
index 00000000..61fc6f61
--- /dev/null
+++ b/include/espspi/Ethernet.h
@@ -0,0 +1,9 @@
+#ifndef WIFISPI_H
+#define WIFISPI_H
+
+// Glue between STM32_EthernetWebserver and WiFiSpi library
+#include <WiFiSpi.h>
+using EthernetClient = WiFiSpiClient; // Alias
+using EthernetServer = WiFiSpiServer;
+
+#endif
\ No newline at end of file
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
index f4161a51..23894dd2 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
@@ -15,6 +15,7 @@ build_flags =
     ${env.build_flags}
     ${flags.stm32_flags}
     -I include/stm32f4
+    -I include/espspi
 ; -- TFT_eSPI build options ------------------------
     ${lcd.lolin24}
     ;-D TFT_MISO=PB4 ;Default
@@ -56,8 +57,7 @@ lib_deps =
     ; STM32duino STM32Ethernet@^1.0.5
     ; https://github.com/stm32duino/LwIP.git
     ; https://github.com/netwizeBE/Ethernet3.git
-    ; https://github.com/khoih-prog/EthernetWebServer_STM32
-    https://github.com/arovak/EthernetWebServer_STM32.git
+    https://github.com/khoih-prog/EthernetWebServer_STM32
     https://github.com/JiriBilek/WiFiSpi.git
 
 lib_ignore =
@@ -65,6 +65,6 @@ lib_ignore =
     XPT2046_Touchscreen
     lv_lib_zifont
 
-src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
+src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/> +<espspi/>
 
 ;***************************************************