diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 238eed002..40d922bd4 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -25,6 +25,7 @@ ARDUINO 1.5.7 BETA
 * Explicitly define compiler.path in avr/platform.txt (Matthijs Kooijman)
 * Make the low available memory message a warning (Matt Robinson)
 * Proceed with upload even if port can't be found (David Mellis)
+* Added support for ArduinoISP
 
 [libraries]
 * Updated SpaceBrew library
diff --git a/hardware/arduino/avr/firmwares/arduinoISP/readme.txt b/hardware/arduino/avr/firmwares/arduinoISP/readme.txt
new file mode 100644
index 000000000..a150f9622
--- /dev/null
+++ b/hardware/arduino/avr/firmwares/arduinoISP/readme.txt
@@ -0,0 +1,5 @@
+
+You can download the ArduinoISP firmware source files from:
+
+https://github.com/arduino/ArduinoISP
+
diff --git a/hardware/arduino/avr/programmers.txt b/hardware/arduino/avr/programmers.txt
index 54c04e75c..a553bdea6 100644
--- a/hardware/arduino/avr/programmers.txt
+++ b/hardware/arduino/avr/programmers.txt
@@ -17,6 +17,11 @@ usbtinyisp.protocol=usbtiny
 usbtinyisp.program.tool=avrdude
 usbtinyisp.program.extra_params=
 
+arduinoisp.name=ArduinoISP
+arduinoisp.protocol=arduinoisp
+arduinoisp.program.tool=avrdude
+arduinoisp.program.extra_params=
+
 usbasp.name=USBasp
 usbasp.communication=usb
 usbasp.protocol=usbasp
@@ -31,11 +36,11 @@ parallel.force=true
 parallel.program.tool=avrdude
 parallel.program.extra_params=-F
 
-arduinoisp.name=Arduino as ISP
-arduinoisp.communication=serial
-arduinoisp.protocol=stk500v1
-arduinoisp.speed=19200
-arduinoisp.program.protocol=stk500v1
-arduinoisp.program.speed=19200
-arduinoisp.program.tool=avrdude
-arduinoisp.program.extra_params=-P{serial.port} -b{program.speed}
+arduinoasisp.name=Arduino as ISP
+arduinoasisp.communication=serial
+arduinoasisp.protocol=stk500v1
+arduinoasisp.speed=19200
+arduinoasisp.program.protocol=stk500v1
+arduinoasisp.program.speed=19200
+arduinoasisp.program.tool=avrdude
+arduinoasisp.program.extra_params=-P{serial.port} -b{program.speed}