diff --git a/README.rst b/README.rst
index ec6d75a4..af967db0 100644
--- a/README.rst
+++ b/README.rst
@@ -43,6 +43,7 @@ Jedi can currently be used with the following editors:
 - SourceLair_
 - `GNOME Builder`_ (with support for GObject Introspection)
 - `Visual Studio Code`_ (via `Python Extension <https://marketplace.visualstudio.com/items?itemName=donjayamanne.python>`_)
+- Gedit (gedi_)
 
 And it powers the following projects:
 
@@ -195,3 +196,4 @@ For more detailed information visit the `testing documentation
 .. _SourceLair: https://www.sourcelair.com
 .. _GNOME Builder: https://wiki.gnome.org/Apps/Builder
 .. _Visual Studio Code: https://code.visualstudio.com/
+.. _gedi: https://github.com/isamert/gedi
diff --git a/docs/docs/usage.rst b/docs/docs/usage.rst
index 0bc0a97a..48a692c7 100644
--- a/docs/docs/usage.rst
+++ b/docs/docs/usage.rst
@@ -61,6 +61,9 @@ GNOME Builder:
   <https://git.gnome.org/browse/gnome-builder/tree/plugins/jedi>`__,
   and is enabled by default.
 
+Gedit:
+
+- gedi_
 
 .. _other-software:
 
@@ -103,3 +106,4 @@ Using a custom ``$HOME/.pythonrc.py``
 .. _autocomplete-python: https://atom.io/packages/autocomplete-python
 .. _SourceLair: https://www.sourcelair.com
 .. _GNOME Builder: https://wiki.gnome.org/Apps/Builder/
+.. _gedi: https://github.com/isamert/gedi