diff --git a/boards/wemos-zero/Makefile.include b/boards/wemos-zero/Makefile.include
index 18e6d45dde24..5e5b9a8673df 100644
--- a/boards/wemos-zero/Makefile.include
+++ b/boards/wemos-zero/Makefile.include
@@ -1,5 +1,16 @@
-CFLAGS += -DBOOTLOADER_UF2
-
 # Include all definitions for flashing with bossa other USB
 include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include
 include $(RIOTBOARD)/common/arduino-zero/Makefile.include
+
+# Depending on whether the board is running RIOT or the bootloader, it has
+# registers using a different vendor and model. We try to detect either.
+TTY_BOARD_FILTER := --model $(BOARD) --vendor 'RIOT-os\.org'
+PROG_TTY_BOARD_FILTER := --vendor 'Arduino LLC' --model 'Arduino Zero'
+TTY_SELECT_CMD := $(RIOTTOOLS)/usb-serial/ttys.py \
+                  --most-recent \
+                  --format path serial \
+                  $(TTY_BOARD_FILTER) || \
+                  $(RIOTTOOLS)/usb-serial/ttys.py \
+                  --most-recent \
+                  --format path serial \
+                  $(PROG_TTY_BOARD_FILTER_CLONE)
diff --git a/boards/wemos-zero/doc.txt b/boards/wemos-zero/doc.txt
index 42e554a98bfd..782d07710329 100644
--- a/boards/wemos-zero/doc.txt
+++ b/boards/wemos-zero/doc.txt
@@ -47,8 +47,7 @@ Metro M0 Express should also work with board definition.
 
 ## Flashing the device
 
-Assuming the [UF2 Bootloader](https://github.com/microsoft/uf2-samdx1) is
-installed, just run:
+Assuming the Arduino Bootloader is installed, just run:
 
 ```
 make BOARD=wemos-zero flash