diff --git a/HISTORY.rst b/HISTORY.rst
index 5aa6b40d..d4175898 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,11 @@ Release Notes
 PlatformIO 2.0
 --------------
 
+2.9.3 (2016-06-??)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed firmware uploading to the embedded boards with SAM-BA bootloader
+
 2.9.2 (2016-06-02)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/scripts/99-platformio-udev.rules b/scripts/99-platformio-udev.rules
index 5ac03b12..5e77fc80 100644
--- a/scripts/99-platformio-udev.rules
+++ b/scripts/99-platformio-udev.rules
@@ -45,8 +45,14 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", MODE:="066
 # QinHeng Electronics HL-340 USB-Serial adapter
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", MODE:="0666"
 
-# ARDUINO UNO
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0043", MODE:="0666"
+# ARDUINO
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="00??", MODE:="0666"
+
+# Arduino SAM-BA
+ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", ENV{MTP_NO_PROBE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", MODE:="0666"
+KERNEL=="ttyACM*", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", MODE:="0666"
 
 # Digistump boards
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="0753", MODE:="0666"