diff --git a/README.rst b/README.rst
index 94223421..e1c80f5d 100644
--- a/README.rst
+++ b/README.rst
@@ -194,6 +194,12 @@ Tests are also run automatically on `Travis CI
 For more detailed information visit the `testing documentation
 <https://jedi.readthedocs.org/en/latest/docs/testing.html>`_.
 
+Acknowledgements
+================
+
+Thanks a lot to all the
+`contributors <https://jedi.readthedocs.org/en/latest/docs/acknowledgements.html>`_!
+
 
 .. _jedi-vim: https://github.com/davidhalter/jedi-vim
 .. _youcompleteme: https://github.com/ycm-core/YouCompleteMe
diff --git a/docs/docs/acknowledgements.rst b/docs/docs/acknowledgements.rst
index 335ae256..52fa533d 100644
--- a/docs/docs/acknowledgements.rst
+++ b/docs/docs/acknowledgements.rst
@@ -6,11 +6,13 @@ History & Acknowledgements
 Acknowledgements
 ----------------
 
+- Dave Halter for creating and maintaining Jedi & Parso.
 - Takafumi Arakaki (@tkf) for creating a solid test environment and a lot of
   other things.
 - Danilo Bargen (@dbrgn) for general housekeeping and being a good friend :).
 - Guido van Rossum (@gvanrossum) for creating the parser generator pgen2
   (originally used in lib2to3).
+- Thanks to all the :ref:`contributors <contributors>`.
 
 A Little Bit of History
 -----------------------
@@ -59,5 +61,6 @@ auto-completion work, he said:
 
 Now that it is finished, I hope he likes it :-).
 
+.. _contributors:
 
 .. include:: ../../AUTHORS.txt