diff --git a/platform.json b/platform.json
index 6f309b6..dab5868 100644
--- a/platform.json
+++ b/platform.json
@@ -114,7 +114,7 @@
       "type": "debugger",
       "optional": true,
       "owner": "platformio",
-      "version": "~1.1000.20181026"
+      "version": "~2.1000.0"
     },
     "tool-mkspiffs": {
       "type": "uploader",
diff --git a/platform.py b/platform.py
index 8f85616..13af013 100644
--- a/platform.py
+++ b/platform.py
@@ -122,7 +122,8 @@ class Espressif32Platform(PlatformBase):
             server_args = [
                 "-s", "$PACKAGE_DIR/share/openocd/scripts",
                 "-f", "interface/%s.cfg" % openocd_interface,
-                "-f", "board/%s" % debug.get("openocd_board")
+                "-f", "board/%s" % debug.get("openocd_board"),
+                "-c", "adapter_khz %d" % debug.get("adapter_speed", 20000)
             ]
 
             debug['tools'][link] = {