diff --git a/HISTORY.rst b/HISTORY.rst
index 32650f05..2169836a 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -14,6 +14,9 @@ PlatformIO 2.0
   (`issue #403 <https://github.com/platformio/platformio/issues/403>`_)
 * Added support for RFDuino
   (`issue #319 <https://github.com/platformio/platformio/issues/319>`_)
+* Project generator for `Emacs <http://docs.platformio.org/en/latest/ide/emacs.html>`__
+  text editor
+  (`pull #404 <https://github.com/platformio/platformio/pull/404>`_)
 * Updated Arduino framework for Atmel AVR development platform to 1.6.7
 * Documented `firmware uploading for Atmel AVR development platform using
   Programmers <http://docs.platformio.org/en/latest/platforms/atmelavr.html#upload-using-programmer>`_:
diff --git a/README.rst b/README.rst
index b637490f..d3fa51ad 100644
--- a/README.rst
+++ b/README.rst
@@ -93,7 +93,7 @@ settings for most popular `Embedded Boards <http://platformio.org/#!/boards>`_.
 
 * Colourful `command-line output <https://raw.githubusercontent.com/platformio/platformio/develop/examples/platformio-examples.png>`_
 * `IDE Integration <http://docs.platformio.org/en/latest/ide.html>`_ with
-  *Arduino, Eclipse, Energia, Qt Creator, Sublime Text, Vim, Visual Studio*
+  *Arduino, Eclipse, Emacs, Energia, Qt Creator, Sublime Text, Vim, Visual Studio*
 * Cloud compiling and `Continuous Integration <http://docs.platformio.org/en/latest/ci/index.html>`_
   with *AppVeyor, Circle CI, Drone, Shippable, Travis CI*
 * Built-in `Serial Port Monitor <http://docs.platformio.org/en/latest/userguide/cmd_serialports.html#platformio-serialports-monitor>`_ and configurable
diff --git a/docs/ide/emacs.rst b/docs/ide/emacs.rst
index 7c151103..1fe6f1f9 100644
--- a/docs/ide/emacs.rst
+++ b/docs/ide/emacs.rst
@@ -48,9 +48,8 @@ Code completion can optionally be provided by installing `irony-mode <https://gi
 Project Generator
 ^^^^^^^^^^^^^^^^^
 
-You can generate an Emacs compatible project using
-:option:`platformio init --ide` command. Please choose board type using
-:ref:`cmd_boards` command and run:
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
 
diff --git a/docs/index.rst b/docs/index.rst
index de7afbc6..c380d52e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -46,7 +46,7 @@ Embedded Development. *Easier Than Ever.*
 -----------------------------------------
 
 * Colourful command-line output
-* :ref:`IDE Integration <ide>` with *Arduino, Eclipse, Energia, Qt Creator,
+* :ref:`IDE Integration <ide>` with *Arduino, Eclipse, Emacs, Energia, Qt Creator,
   Sublime Text, Vim, Visual Studio*
 * Cloud compiling and  :ref:`ci` with *AppVeyor, Circle CI, Drone, Shippable, Travis CI*
 * Built-in :ref:`Serial Port Monitor <cmd_serialports_monitor>` and
diff --git a/platformio/ide/tpls/emacs/.gitignore.tpl b/platformio/ide/tpls/emacs/.gitignore.tpl
index f26ff798..e0b8fd9d 100644
--- a/platformio/ide/tpls/emacs/.gitignore.tpl
+++ b/platformio/ide/tpls/emacs/.gitignore.tpl
@@ -1,3 +1,4 @@
+.pioenvs
 CMakeCache.txt
 CMakeFiles/
 MakeFile