diff --git a/README.rst b/README.rst
index c6bd4774..d0f12c3e 100644
--- a/README.rst
+++ b/README.rst
@@ -34,7 +34,7 @@ me.
 Jedi can be used with the following editors:
 
 - Vim (jedi-vim_, YouCompleteMe_)
-- Emacs (Jedi.el_)
+- Emacs (Jedi.el_, company-jedi_)
 - Sublime Text (SublimeJEDI_ [ST2 + ST3], anaconda_ [only ST3])
 - SynWrite_
 
@@ -137,6 +137,7 @@ For more detailed information visit the `testing documentation
 .. _jedi-vim: https://github.com/davidhalter/jedi-vim
 .. _youcompleteme: http://valloric.github.io/YouCompleteMe/
 .. _Jedi.el: https://github.com/tkf/emacs-jedi
+.. _company-jedi: https://github.com/proofit404/company-jedi
 .. _sublimejedi: https://github.com/srusskih/SublimeJEDI
 .. _anaconda: https://github.com/DamnWidget/anaconda
 .. _SynWrite: http://uvviewsoft.com/synjedi/
diff --git a/docs/docs/usage.rst b/docs/docs/usage.rst
index ca5ddbe8..dee9229e 100644
--- a/docs/docs/usage.rst
+++ b/docs/docs/usage.rst
@@ -25,6 +25,7 @@ Vim:
 Emacs:
 
 - `Jedi.el <https://github.com/tkf/emacs-jedi>`_
+- company-jedi_
 
 Sublime Text 2/3:
 
@@ -62,3 +63,5 @@ Using a custom ``$HOME/.pythonrc.py``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. autofunction:: jedi.utils.setup_readline
+
+.. _company-jedi: https://github.com/proofit404/company-jedi