diff --git a/HISTORY.rst b/HISTORY.rst
index f1cfbb16..930fcbdf 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,7 @@ Release History
 2.2.2 (2015-??-??)
 ------------------
 
+* Integration with `Atom IDE <http://docs.platformio.org/en/latest/ide/atom.html>`__
 * Disable project auto-clean while building/uploading firmware using
   `platformio run --disable-auto-clean <http://docs.platformio.org/en/latest/userguide/cmd_run.html#cmdoption--disable-auto-clean>`_ option
   (`issue #255 <https://github.com/platformio/platformio/issues/255>`_)
diff --git a/docs/_static/ide-platformio-atom-1.gif b/docs/_static/ide-platformio-atom-1.gif
new file mode 100644
index 00000000..3ee6c899
Binary files /dev/null and b/docs/_static/ide-platformio-atom-1.gif differ
diff --git a/docs/_static/ide-platformio-atom-2.gif b/docs/_static/ide-platformio-atom-2.gif
new file mode 100644
index 00000000..2a367374
Binary files /dev/null and b/docs/_static/ide-platformio-atom-2.gif differ
diff --git a/docs/ide.rst b/docs/ide.rst
index 6e5623fe..aa76637b 100644
--- a/docs/ide.rst
+++ b/docs/ide.rst
@@ -7,6 +7,7 @@ IDE Integration
     :maxdepth: 2
 
     ide/arduino
+    ide/atom
     ide/clion
     ide/eclipse
     ide/energia
diff --git a/docs/ide/atom.rst b/docs/ide/atom.rst
new file mode 100644
index 00000000..c4fa674c
--- /dev/null
+++ b/docs/ide/atom.rst
@@ -0,0 +1,39 @@
+.. _ide_atom:
+
+Atom
+====
+
+`Atom <https://atom.io>`_ is a text editor that's modern, approachable,
+yet hackable to the core—a tool you can customize to do anything but also use
+productively without ever touching a config file.
+
+This software can be used with:
+
+* all available :ref:`platforms`
+* all available :ref:`frameworks`
+
+Refer to the `Atom Documentation <https://atom.io/docs>`_
+page for more detailed information.
+
+.. contents::
+
+Integration
+-----------
+
+Using `Atom Packages <https://atom.io/docs/v1.0.2/using-atom-atom-packages>`_
+please install `platomformio <https://atom.io/packages/platomformio>`_ package.
+
+Screenshot
+----------
+
+Building
+^^^^^^^^
+
+.. image:: ../_static/ide-platformio-atom-1.gif
+    :target: https://atom.io/packages/platomformio
+
+Uploading
+^^^^^^^^^
+
+.. image:: ../_static/ide-platformio-atom-2.gif
+    :target: https://atom.io/packages/platomformio