diff --git a/tools/sky/msp430-bsl-linux b/tools/sky/msp430-bsl-linux
index 133f1bd35..c78e18640 100755
--- a/tools/sky/msp430-bsl-linux
+++ b/tools/sky/msp430-bsl-linux
@@ -1162,8 +1162,9 @@ class BootStrapLoader(LowLevel):
         sys.stderr.flush()
         self.bslTxRx(self.BSL_CHANGEBAUD,   #Command: change baudrate
                     a, l)                   #args are coded in adr and len
+        self.serialport.flush()
         time.sleep(0.010)                   #recomended delay
-        self.serialport.setBaudrate(baudrate)
+        self.serialport.baudrate = baudrate
 
     def actionReadBSLVersion(self):
         """informational output of BSL version number.
diff --git a/tools/zolertia/z1-bsl b/tools/zolertia/z1-bsl
index 7c0584337..31d58d1df 100755
--- a/tools/zolertia/z1-bsl
+++ b/tools/zolertia/z1-bsl
@@ -1350,8 +1350,9 @@ class BootStrapLoader(LowLevel):
         sys.stderr.flush()
         self.bslTxRx(self.BSL_CHANGEBAUD,   #Command: change baudrate
                     a, l)                   #args are coded in adr and len
+        self.serialport.flush()
         time.sleep(0.010)                   #recomended delay
-        self.serialport.setBaudrate(baudrate)
+        self.serialport.baudrate = baudrate
 
     def actionReadBSLVersion(self):
         """informational output of BSL version number.
diff --git a/tools/zolertia/z1-bsl-nopic b/tools/zolertia/z1-bsl-nopic
index 802c84642..8b5edd8f5 100755
--- a/tools/zolertia/z1-bsl-nopic
+++ b/tools/zolertia/z1-bsl-nopic
@@ -1364,8 +1364,9 @@ class BootStrapLoader(LowLevel):
         sys.stderr.flush()
         self.bslTxRx(self.BSL_CHANGEBAUD,   #Command: change baudrate
                     a, l)                   #args are coded in adr and len
+        self.serialport.flush()
         time.sleep(0.010)                   #recomended delay
-        self.serialport.setBaudrate(baudrate)
+        self.serialport.baudrate = baudrate
 
     def actionReadBSLVersion(self):
         """informational output of BSL version number.