diff --git a/HISTORY.rst b/HISTORY.rst
index 46545814..681efde6 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,12 +4,14 @@ Release History
 PlatformIO 2.0
 --------------
 
-2.3.6 (2015-??-??)
+2.4.0 (2015-??-??)
 ~~~~~~~~~~~~~~~~~~
 
 * Added support for the new boards: Atmel ATSAMR21-XPRO, Atmel SAML21-XPRO-B,
   Atmel SAMD21-XPRO, ST 32F469IDISCOVERY, ST 32L476GDISCOVERY, ST Nucleo F031K6,
   ST Nucleo F042K6, ST Nucleo F303K8 and ST Nucleo L476RG
+* Updated Arduino core for Espressif platform to 2.0.0
+  (`issue #345 <https://github.com/platformio/platformio/issues/345>`_)
 * Added to FAQ explanation of `Can not compile a library that compiles without issue
   with Arduino IDE <http://docs.platformio.org/en/latest/faq.html#building>`_
   (`issue #331 <https://github.com/platformio/platformio/issues/331>`_)
diff --git a/platformio/__init__.py b/platformio/__init__.py
index d2792d6a..ec5077f2 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (2, 3, "6.dev3")
+VERSION = (2, 4, "b1")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"