diff --git a/HISTORY.rst b/HISTORY.rst
index 615f72c1..29b2bb9c 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,12 @@ Release Notes
 PlatformIO 2.0
 --------------
 
+2.8.7 (2016-??-??)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed broken compilation for Atmel SAMD based boards except Arduino Due
+  (`issue #598 <https://github.com/platformio/platformio/issues/598>`_)
+
 2.8.6 (2016-03-22)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 3fb5bef8..969c5f68 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 8, 6)
+VERSION = (2, 8, "7.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"