diff --git a/src/avr910.c b/src/avr910.c
index 1507e959..c9326017 100644
--- a/src/avr910.c
+++ b/src/avr910.c
@@ -325,11 +325,8 @@ static int avr910_open(PROGRAMMER *pgm, const char *port) {
     pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   union pinfo pinfo;
-  if(pgm->baudrate == 0)
-    pgm->baudrate = 19200;
-
   pgm->port = port;
-  pinfo.serialinfo.baud = pgm->baudrate;
+  pinfo.serialinfo.baud = pgm->baudrate? pgm->baudrate: 19200;
   pinfo.serialinfo.cflags = SERIAL_8N1;
   if(serial_open(port, pinfo, &pgm->fd) < 0)
     return -1;
diff --git a/src/buspirate.c b/src/buspirate.c
index 275079ed..c4bf5f0a 100644
--- a/src/buspirate.c
+++ b/src/buspirate.c
@@ -450,12 +450,8 @@ static int buspirate_open(PROGRAMMER *pgm, const char *port) {
     }
   }
 
-  // BusPirate runs at 115200 by default
-  if(pgm->baudrate == 0)
-    pgm->baudrate = 115200;
-
   union pinfo pinfo;
-  pinfo.serialinfo.baud = pgm->baudrate;
+  pinfo.serialinfo.baud = pgm->baudrate? pgm->baudrate: 115200;
   pinfo.serialinfo.cflags = SERIAL_8N1;
   pgm->port = port;
   if(serial_open(port, pinfo, &pgm->fd) == -1) {