diff --git a/platform.json b/platform.json
index da7586bd8..b36b6b8a3 100644
--- a/platform.json
+++ b/platform.json
@@ -81,6 +81,12 @@
       "owner": "platformio",
       "version": "~3.20014.0"
     },
+    "framework-arduinoespressif32-libs": {
+      "type": "sdk",
+      "optional": true,
+      "owner": "espressif",
+      "version": "~5.1.0"
+    },
     "framework-espidf": {
       "type": "framework",
       "optional": true,
diff --git a/platform.py b/platform.py
index 54629c4f3..abd09da41 100644
--- a/platform.py
+++ b/platform.py
@@ -305,6 +305,7 @@ def _parse_version(original_version):
                 r"^gcc(?P<MAJOR>\d+)_(?P<MINOR>\d+)_(?P<PATCH>\d+)-esp-(?P<EXTRA>.+)$",
                 r"^esp-(?P<EXTRA>.+)-(?P<MAJOR>\d+)\.(?P<MINOR>\d+)\.?(?P<PATCH>\d+)$",
                 r"^esp-(?P<MAJOR>\d+)\.(?P<MINOR>\d+)\.(?P<PATCH>\d+)(_(?P<EXTRA>.+))?$",
+                r"^idf-release_v(?P<MAJOR>\d+)\.(?P<MINOR>\d+)(.(?P<PATCH>\d+))?(-(?P<EXTRA>.+))?$",
             )
             for pattern in version_patterns:
                 match = re.search(pattern, original_version)
@@ -312,7 +313,7 @@ def _parse_version(original_version):
                     result = "%s.%s.%s" % (
                         match.group("MAJOR"),
                         match.group("MINOR"),
-                        match.group("PATCH"),
+                        match.group("PATCH") if match.group("PATCH") is not None else "0",
                     )
                     if match.group("EXTRA"):
                         result = result + "+%s" % match.group("EXTRA")
@@ -326,6 +327,7 @@ def _parse_version(original_version):
             )
 
         toolchain_remap = {
+            "esp32-arduino-libs": "framework-arduinoespressif32-libs",
             "xtensa-esp32-elf-gcc": "toolchain-xtensa-esp32",
             "xtensa-esp32s2-elf-gcc": "toolchain-xtensa-esp32s2",
             "xtensa-esp32s3-elf-gcc": "toolchain-xtensa-esp32s3",
@@ -385,6 +387,8 @@ def configure_arduino_toolchains(self, package_index):
             self.packages[toolchain_package]["version"] = version
             self.packages[toolchain_package]["owner"] = "espressif"
             self.packages[toolchain_package]["type"] = "toolchain"
+            if (toolchain_package == "framework-arduinoespressif32-libs"):
+                self.packages[toolchain_package]["optional"] = False
 
     def configure_upstream_arduino_packages(self, url_items):
         framework_index_file = os.path.join(