diff --git a/ChangeLog b/ChangeLog
index 989a4c953e..a409c10a20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
             Bangle.js: When reading file info from a filename table, do it in blocks of 8 (20% faster file search)
             Bangle.js2: Increase flash buffer size from 16->32 bytes (5% performance increase)
+            ESP32: update esp-idf to v3.3.6
 
      2v16 : JIT functions now execute in their own function scope (allows arguments)
             Move older 'HY' boards to use `g` for the built-in graphics, not `LCD` (and change docs)
diff --git a/libs/network/esp32/jswrap_esp32_network.c b/libs/network/esp32/jswrap_esp32_network.c
index 8ac61186ec..bb7ab0b512 100644
--- a/libs/network/esp32/jswrap_esp32_network.c
+++ b/libs/network/esp32/jswrap_esp32_network.c
@@ -27,8 +27,8 @@
 #include "tcpip_adapter.h"
 #include "mdns/include/mdns.h"
 
-#include "lwip/apps/ping/ping.h"
-#include "lwip/apps/ping/esp_ping.h"
+#include "lwip/include/apps/ping/ping.h"
+#include "lwip/include/apps/esp_ping.h"
 #include "apps/sntp/sntp.h"
 #include "lwip/dns.h"
 
diff --git a/make/family/ESP32.make b/make/family/ESP32.make
index 082b1b07dd..e48c5f60e1 100755
--- a/make/family/ESP32.make
+++ b/make/family/ESP32.make
@@ -63,11 +63,11 @@ INCLUDE+=\
 -I$(ESP_IDF_PATH)/components/esp32/include \
 -I$(ESP_IDF_PATH)/components/freertos/include \
 -I$(ESP_IDF_PATH)/components/heap/include \
--I$(ESP_IDF_PATH)/components/json/include \
 -I$(ESP_IDF_PATH)/components/log/include \
--I$(ESP_IDF_PATH)/components/lwip/include/lwip \
--I$(ESP_IDF_PATH)/components/lwip/include/lwip/port \
--I$(ESP_IDF_PATH)/components/lwip/include/lwip/posix \
+-I$(ESP_IDF_PATH)/components/lwip/lwip/src/include/posix \
+-I$(ESP_IDF_PATH)/components/lwip/lwip/src/include  \
+-I$(ESP_IDF_PATH)/components/lwip/port/esp32/include \
+-I$(ESP_IDF_PATH)/components/lwip/include_compat \
 -I$(ESP_IDF_PATH)/components/newlib/include \
 -I$(ESP_IDF_PATH)/components/newlib/platform_include \
 -I$(ESP_IDF_PATH)/components/nvs_flash/include \
@@ -77,10 +77,14 @@ INCLUDE+=\
 -I$(ESP_IDF_PATH)/components/soc/esp32/include \
 -I$(ESP_IDF_PATH)/components/soc/esp32/include/soc \
 -I$(ESP_IDF_PATH)/components/vfs/include \
--Itargets/esp32/include
+-I$(ESP_IDF_PATH)/components/esp_ringbuf/include \
+-I$(ESP_IDF_PATH)/components/lwip/include/apps/sntp \
+-I$(ESP_IDF_PATH)/components/esp_event/include \
+-I$(ESP_IDF_PATH)/components/lwip/include/apps
+
 LDFLAGS+=-nostdlib -u call_user_start_cpu0 -u ld_include_panic_highint_hdl -Wl,--gc-sections -Wl,-static -Wl,-EL
 LIBS+=-T esp32_out.ld \
--T$(ESP_IDF_PATH)/components/esp32/ld/esp32.common.ld \
+-T esp32.project.ld \
 -T$(ESP_IDF_PATH)/components/esp32/ld/esp32.rom.ld \
 -T$(ESP_IDF_PATH)/components/esp32/ld/esp32.peripherals.ld \
 $(ESP_IDF_PATH)/components/esp32/lib/librtc.a \
@@ -92,6 +96,9 @@ $(ESP_IDF_PATH)/components/esp32/lib/libwps.a \
 $(ESP_IDF_PATH)/components/newlib/lib/libc-psram-workaround.a \
 $(ESP_IDF_PATH)/components/newlib/lib/libm-psram-workaround.a \
 $(ESP_IDF_PATH)/components/esp32/lib/libcore.a \
+$(ESP_APP_TEMPLATE_PATH)/build/esp_ringbuf/libesp_ringbuf.a \
+$(ESP_APP_TEMPLATE_PATH)/build/bootloader_support/libbootloader_support.a \
+$(ESP_APP_TEMPLATE_PATH)/build/bootloader/efuse/libefuse.a \
 -lbt \
 -lbtdm_app \
 -ldriver \