diff --git a/boards/common/sodaq/Makefile.dep b/boards/common/sodaq/Makefile.dep
index 5472bf8b8d..c15f2eaf26 100644
--- a/boards/common/sodaq/Makefile.dep
+++ b/boards/common/sodaq/Makefile.dep
@@ -1,3 +1,6 @@
 ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += saul_gpio
 endif
+
+# setup the samd21 arduino bootloader related dependencies
+include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep
diff --git a/boards/common/sodaq/Makefile.features b/boards/common/sodaq/Makefile.features
index c9ffe71f92..4cc1f1a620 100644
--- a/boards/common/sodaq/Makefile.features
+++ b/boards/common/sodaq/Makefile.features
@@ -12,3 +12,4 @@ FEATURES_PROVIDED += periph_usbdev
 
 # Various other features (if any)
 FEATURES_PROVIDED += arduino
+FEATURES_PROVIDED += bootloader_arduino
diff --git a/boards/common/sodaq/Makefile.include b/boards/common/sodaq/Makefile.include
index 8db3929a94..116cd8b3e4 100644
--- a/boards/common/sodaq/Makefile.include
+++ b/boards/common/sodaq/Makefile.include
@@ -7,8 +7,5 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 # Add board common includes
 INCLUDES += -I$(RIOTBOARD)/common/sodaq/include
 
-# setup the flash tool used
-# we use BOSSA to flash this board since there's an Arduino bootloader
-# preflashed on it. ROM_OFFSET skips the space taken by such bootloader.
-ROM_OFFSET ?= 0x2000
-include $(RIOTMAKE)/tools/bossa.inc.mk
+# Include all definitions for flashing with bossa over USB
+include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.include