diff --git a/platformio/boards/espressif.json b/platformio/boards/espressif.json
index 249733d2..f2c4e3f5 100644
--- a/platformio/boards/espressif.json
+++ b/platformio/boards/espressif.json
@@ -3,7 +3,7 @@
         "build": {
             "core": "esp8266",
             "extra_flags": "-DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 -DESP8266",
-            "f_cpu": "40000000L",
+            "f_cpu": "80000000L",
             "ldscript": "esp8266.flash.512k.ld",
             "mcu": "esp8266",
             "variant": "generic"
diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py
index 2496111c..8515cabd 100644
--- a/platformio/builder/scripts/espressif.py
+++ b/platformio/builder/scripts/espressif.py
@@ -75,7 +75,10 @@ env.Replace(
         "-nostdlib",
         "-Wl,--no-check-sections",
         "-u", "call_user_start",
-        "-Wl,-static"
+        "-Wl,-static",
+        "-Wl,--gc-sections",
+        "-Wl,-wrap,system_restart_local",
+        "-Wl,-wrap,register_chipv6_phy"
     ],
 
     SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES',
diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py
index b534f8ac..f6637e36 100644
--- a/platformio/builder/scripts/frameworks/arduino.py
+++ b/platformio/builder/scripts/frameworks/arduino.py
@@ -55,10 +55,10 @@ elif env.get("PLATFORM") == "timsp430":
     )
 elif env.get("PLATFORM") == "espressif":
     env.Prepend(
-        CPPPATH=[join("$PLATFORMFW_DIR", "sdk", "include")],
-        LIBPATH=[join("$PLATFORMFW_DIR", "sdk", "lib")],
+        CPPPATH=[join("$PLATFORMFW_DIR", "tools", "sdk", "include")],
+        LIBPATH=[join("$PLATFORMFW_DIR", "tools", "sdk", "lib")],
         LIBS=["smartconfig", "pp", "main", "wpa", "lwip",
-              "net80211", "wps", "crypto", "phy", "hal", "gcc", "m"]
+              "net80211", "wps", "crypto", "phy", "hal", "axtls", "gcc", "m"]
     )
 
 env.Replace(PLATFORMFW_DIR=PLATFORMFW_DIR)