diff --git a/HISTORY.rst b/HISTORY.rst
index ada57b2c..7b27dae9 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -18,6 +18,12 @@ PlatformIO 2.0
 2.9.5 (2016-06-??)
 ~~~~~~~~~~~~~~~~~~
 
+* Added support for `emonPi <https://github.com/openenergymonitor/emonpi>`__,
+  the OpenEnergyMonitor system
+  (`issue #687 <https://github.com/platformio/platformio/issues/687>`_)
+* Added support for STM32F0 boards for `SPL <http://platformio.org/frameworks/spl>`__
+  framework
+  (`issue #683 <https://github.com/platformio/platformio/issues/683>`_)
 * Added support for `Arduboy DevKit <https://www.arduboy.com>`__, the game system
   the size of a credit card
 
diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst
index ebb4d499..f7a4877a 100644
--- a/docs/frameworks/arduino.rst
+++ b/docs/frameworks/arduino.rst
@@ -1197,6 +1197,26 @@ OpenBCI
       - 128 Kb
       - 32 Kb
 
+OpenEnergyMonitor
+~~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``emonpi``
+      - `emonPi <https://github.com/openenergymonitor/emonpi>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+
 PONTECH
 ~~~~~~~
 
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index 64804ec9..58185e7c 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -812,6 +812,26 @@ Microduino
       - 64 Kb
       - 4 Kb
 
+OpenEnergyMonitor
+~~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``emonpi``
+      - `emonPi <https://github.com/openenergymonitor/emonpi>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+
 PanStamp
 ~~~~~~~~
 
diff --git a/docs/platforms/embedded_boards.rst b/docs/platforms/embedded_boards.rst
index ad63ea57..7095dd76 100644
--- a/docs/platforms/embedded_boards.rst
+++ b/docs/platforms/embedded_boards.rst
@@ -1562,6 +1562,26 @@ OpenBCI
       - 128 Kb
       - 32 Kb
 
+OpenEnergyMonitor
+~~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``emonpi``
+      - `emonPi <https://github.com/openenergymonitor/emonpi>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+
 Outrageous Circuits
 ~~~~~~~~~~~~~~~~~~~