diff --git a/HISTORY.md b/HISTORY.md
index 5a5a758..8c3038f 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -7,6 +7,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
 ### 1.1.0 (in development)
 - Don't append port details to avrdude for usbasp. See #123
 - Ignore commented lines while parsing boards.txt file. See #124
+- In ISP mode, read baudrate and programmer from boards.txt. See #125
 
 ### 1.0.1 (2013-09-25)
 - Unconditionally add -D in avrdude options. See #114
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index d2b3e62..9c1b940 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -976,11 +976,19 @@ endif
 AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(call get_monitor_port)
 
 ifndef ISP_PROG
-    ISP_PROG   = stk500v1
+    ifneq ($(strip $(AVRDUDE_ARD_PROGRAMMER)),)
+        ISP_PROG = $(AVRDUDE_ARD_PROGRAMMER)
+    else
+        ISP_PROG = stk500v1
+    endif
 endif
 
 ifndef AVRDUDE_ISP_BAUDRATE
-    AVRDUDE_ISP_BAUDRATE = 19200
+    ifneq ($(strip $(AVRDUDE_ARD_BAUDRATE)),)
+        AVRDUDE_ISP_BAUDRATE = $(AVRDUDE_ARD_BAUDRATE)
+    else
+        AVRDUDE_ISP_BAUDRATE = 19200
+    endif
 endif
 
 # Pre fuse settings