diff --git a/README.rst b/README.rst
index 0fbb1088..774a4d85 100644
--- a/README.rst
+++ b/README.rst
@@ -39,6 +39,7 @@ Jedi can currently be used with the following editors:
 - TextMate_ (Not sure if it's actually working)
 - Kate_ version 4.13+ supports it natively, you have to enable it, though. [`proof
   <https://projects.kde.org/projects/kde/applications/kate/repository/show?rev=KDE%2F4.13>`_]
+- Atom_ (autocomplete-python_)
 
 And it powers the following projects:
 
@@ -186,3 +187,5 @@ For more detailed information visit the `testing documentation
 .. _wdb: https://github.com/Kozea/wdb
 .. _TextMate: https://github.com/lawrenceakka/python-jedi.tmbundle
 .. _Kate: http://kate-editor.org
+.. _Atom: https://atom.io/
+.. _autocomplete-python: https://atom.io/packages/autocomplete-python
diff --git a/docs/docs/usage.rst b/docs/docs/usage.rst
index 960ca2ab..12fbf66f 100644
--- a/docs/docs/usage.rst
+++ b/docs/docs/usage.rst
@@ -47,6 +47,10 @@ Kate:
   <https://projects.kde.org/projects/kde/applications/kate/repository/entry/addons/kate/pate/src/plugins/python_autocomplete_jedi.py?rev=KDE%2F4.13>`__,
   you have to enable it, though.
 
+Atom:
+
+- autocomplete-python_
+
 
 .. _other-software:
 
@@ -86,3 +90,4 @@ Using a custom ``$HOME/.pythonrc.py``
 .. _wdb: https://github.com/Kozea/wdb
 .. _TextMate: https://github.com/lawrenceakka/python-jedi.tmbundle
 .. _kate: http://kate-editor.org/
+.. _autocomplete-python: https://atom.io/packages/autocomplete-python