diff --git a/platformio/boards/digistump.json b/platformio/boards/digistump.json
index 141a7a50..a032b779 100644
--- a/platformio/boards/digistump.json
+++ b/platformio/boards/digistump.json
@@ -14,7 +14,7 @@
             "disable_flushing": false,
             "maximum_ram_size": 512,
             "maximum_size": 14844,
-            "protocol": "usb",
+            "protocol": "digispark",
             "use_1200bps_touch": false,
             "wait_for_upload_port": false
         }
@@ -34,7 +34,7 @@
             "disable_flushing": false,
             "maximum_ram_size": 512,
             "maximum_size": 14844,
-            "protocol": "usb",
+            "protocol": "digispark",
             "use_1200bps_touch": false,
             "wait_for_upload_port": false
         }
@@ -54,7 +54,7 @@
             "disable_flushing": false,
             "maximum_ram_size": 512,
             "maximum_size": 14844,
-            "protocol": "usb",
+            "protocol": "digispark",
             "use_1200bps_touch": false,
             "wait_for_upload_port": false
         }
@@ -74,7 +74,7 @@
             "disable_flushing": false,
             "maximum_ram_size": 512,
             "maximum_size": 14844,
-            "protocol": "usb",
+            "protocol": "digispark",
             "use_1200bps_touch": false,
             "wait_for_upload_port": false
         }
diff --git a/platformio/builder/scripts/digistump.py b/platformio/builder/scripts/digistump.py
index 16043fd6..7e3a263c 100644
--- a/platformio/builder/scripts/digistump.py
+++ b/platformio/builder/scripts/digistump.py
@@ -44,16 +44,10 @@ else:
     env = SConscript(env.subst(
         join("$PIOBUILDER_DIR", "scripts", "baseavr.py")), exports="env")
     env.Replace(
-        UPLOADER=join("$PIOPACKAGES_DIR", "tool-avrdude", "avrdude"),
+        UPLOADER=join("$PIOPACKAGES_DIR", "tool-micronucleus", "micronucleus"),
         UPLOADERFLAGS=[
-            "-q",  # suppress progress output
-            "-D",  # disable auto erase for flash memory
-            "-p", "$BOARD_MCU",
-            "-C", '"%s"' % join("$PIOPACKAGES_DIR",
-                                "tool-avrdude", "avrdude.conf"),
             "-c", "$UPLOAD_PROTOCOL",
-            "-b", "$UPLOAD_SPEED",
-            "-P", "$UPLOAD_PORT"
+            "--timeout", "60"
         ],
         UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS -U flash:w:$SOURCES:i'
     )
diff --git a/platformio/platforms/digistump.py b/platformio/platforms/digistump.py
index 74eea2b4..8c47b4f2 100644
--- a/platformio/platforms/digistump.py
+++ b/platformio/platforms/digistump.py
@@ -30,7 +30,7 @@ class DigistumpPlatform(BasePlatform):
             "default": True
         },
 
-        "tool-avrdude": {
+        "tool-micronucleus": {
             "default": True
         },
 
@@ -54,7 +54,7 @@ class DigistumpPlatform(BasePlatform):
                 tuploader = "tool-bossac"
             else:
                 tpackage = "toolchain-atmelavr"
-                tuploader = "tool-avrdude"
+                tuploader = "tool-micronucleus"
             self.PACKAGES[tpackage]['alias'] = "toolchain"
             self.PACKAGES[tuploader]['alias'] = "uploader"
             break