diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst
index 0e5b8b80..e0d9c67f 100644
--- a/docs/frameworks/arduino.rst
+++ b/docs/frameworks/arduino.rst
@@ -392,7 +392,7 @@ Arduino
       - 32 Kb
 
     * - ``mzeroUSB``
-      - `Arduino M0 Pro (Native USB Port) <http://www.arduino.org/products/boards/arduino-m0-pro>`_
+      - `Arduino M0 <http://www.arduino.org/products/boards/arduino-m0>`_
       - SAMD21G18A
       - 48 MHz
       - 256 Kb
@@ -405,6 +405,13 @@ Arduino
       - 256 Kb
       - 32 Kb
 
+    * - ``mzeroproUSB``
+      - `Arduino M0 Pro (Native USB Port) <http://www.arduino.org/products/boards/arduino-m0-pro>`_
+      - SAMD21G18A
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
     * - ``nanoatmega168``
       - `Arduino Nano ATmega168 <http://www.arduino.org/products/boards/4-arduino-boards/arduino-nano>`_
       - ATMEGA168
@@ -1857,6 +1864,26 @@ Wicked Device
       - 128 Kb
       - 16 Kb
 
+chipKIT
+~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``lenny``
+      - `chipKIT Lenny <http://chipkit.net/tag/lenny/>`_
+      - 32MX270F256D
+      - 40 MHz
+      - 128 Kb
+      - 32 Kb
+
 element14
 ~~~~~~~~~
 
diff --git a/docs/platforms/atmelsam.rst b/docs/platforms/atmelsam.rst
index a90b15b6..12cbc41a 100644
--- a/docs/platforms/atmelsam.rst
+++ b/docs/platforms/atmelsam.rst
@@ -143,7 +143,7 @@ Arduino
       - 32 Kb
 
     * - ``mzeroUSB``
-      - `Arduino M0 Pro (Native USB Port) <http://www.arduino.org/products/boards/arduino-m0-pro>`_
+      - `Arduino M0 <http://www.arduino.org/products/boards/arduino-m0>`_
       - SAMD21G18A
       - 48 MHz
       - 256 Kb
@@ -156,6 +156,13 @@ Arduino
       - 256 Kb
       - 32 Kb
 
+    * - ``mzeroproUSB``
+      - `Arduino M0 Pro (Native USB Port) <http://www.arduino.org/products/boards/arduino-m0-pro>`_
+      - SAMD21G18A
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
     * - ``tian``
       - `Arduino Tian <http://www.arduino.org/products/boards/arduino-tian>`_
       - SAMD21G18A
diff --git a/docs/platforms/embedded_boards.rst b/docs/platforms/embedded_boards.rst
index 2b8cc1c4..f5a6a0d6 100644
--- a/docs/platforms/embedded_boards.rst
+++ b/docs/platforms/embedded_boards.rst
@@ -378,7 +378,7 @@ Arduino
       - 32 Kb
 
     * - ``mzeroUSB``
-      - `Arduino M0 Pro (Native USB Port) <http://www.arduino.org/products/boards/arduino-m0-pro>`_
+      - `Arduino M0 <http://www.arduino.org/products/boards/arduino-m0>`_
       - SAMD21G18A
       - 48 MHz
       - 256 Kb
@@ -391,6 +391,13 @@ Arduino
       - 256 Kb
       - 32 Kb
 
+    * - ``mzeroproUSB``
+      - `Arduino M0 Pro (Native USB Port) <http://www.arduino.org/products/boards/arduino-m0-pro>`_
+      - SAMD21G18A
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
     * - ``nanoatmega168``
       - `Arduino Nano ATmega168 <http://www.arduino.org/products/boards/4-arduino-boards/arduino-nano>`_
       - ATMEGA168
@@ -2740,6 +2747,26 @@ Wicked Device
       - 128 Kb
       - 16 Kb
 
+chipKIT
+~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``lenny``
+      - `chipKIT Lenny <http://chipkit.net/tag/lenny/>`_
+      - 32MX270F256D
+      - 40 MHz
+      - 128 Kb
+      - 32 Kb
+
 element14
 ~~~~~~~~~
 
diff --git a/docs/platforms/microchippic32.rst b/docs/platforms/microchippic32.rst
index 7f38d2bb..51c92e8e 100644
--- a/docs/platforms/microchippic32.rst
+++ b/docs/platforms/microchippic32.rst
@@ -332,6 +332,26 @@ UBW32
       - 512 Kb
       - 128 Kb
 
+chipKIT
+~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``lenny``
+      - `chipKIT Lenny <http://chipkit.net/tag/lenny/>`_
+      - 32MX270F256D
+      - 40 MHz
+      - 128 Kb
+      - 32 Kb
+
 element14
 ~~~~~~~~~