diff --git a/README.rst b/README.rst
index e1c80f5d..fa735fff 100644
--- a/README.rst
+++ b/README.rst
@@ -2,13 +2,13 @@
 Jedi - an awesome autocompletion, static analysis and refactoring library for Python
 ####################################################################################
 
-.. image:: https://img.shields.io/pypi/v/jedi.svg?style=flat
-    :target: https://pypi.python.org/pypi/jedi
-    :alt: PyPI version
+.. image:: http://isitmaintained.com/badge/open/davidhalter/jedi.svg
+    :target: https://github.com/davidhalter/jedi/issues
+    :alt: The percentage of open issues and pull requests
 
-.. image:: https://img.shields.io/pypi/pyversions/jedi.svg
-    :target: https://pypi.python.org/pypi/jedi
-    :alt: Supported Python versions
+.. image:: http://isitmaintained.com/badge/resolution/davidhalter/jedi.svg
+    :target: https://github.com/davidhalter/jedi/issues
+    :alt: The resolution time is the median time an issue or pull request stays open.
 
 .. image:: https://travis-ci.org/davidhalter/jedi.svg?branch=master
     :target: https://travis-ci.org/davidhalter/jedi
diff --git a/docs/index.rst b/docs/index.rst
index 327a1c76..2a1adac0 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,9 +1,36 @@
 .. include global.rst
 
+.. meta::
+    :github_url: https://github.com/davidhalter/jedi
+
 Jedi - an awesome autocompletion, static analysis and refactoring library for Python
 ====================================================================================
 
-Release v\ |release|. (:doc:`Installation <docs/installation>`)
+.. image:: https://img.shields.io/github/stars/davidhalter/jedi.svg?style=social&label=Star&maxAge=2592000
+    :target: https://github.com/davidhalter/jedi
+    :alt: GitHub stars
+
+.. image:: http://isitmaintained.com/badge/open/davidhalter/jedi.svg
+    :target: https://github.com/davidhalter/jedi/issues
+    :alt: The percentage of open issues and pull requests
+
+.. image:: http://isitmaintained.com/badge/resolution/davidhalter/jedi.svg
+    :target: https://github.com/davidhalter/jedi/issues
+    :alt: The resolution time is the median time an issue or pull request stays open.
+
+.. image:: https://travis-ci.org/davidhalter/jedi.svg?branch=master
+    :target: https://travis-ci.org/davidhalter/jedi
+    :alt: Linux Tests
+
+.. image:: https://ci.appveyor.com/api/projects/status/mgva3bbawyma1new/branch/master?svg=true
+    :target: https://ci.appveyor.com/project/davidhalter/jedi/branch/master
+    :alt: Windows Tests
+
+.. image:: https://coveralls.io/repos/davidhalter/jedi/badge.svg?branch=master
+    :target: https://coveralls.io/r/davidhalter/jedi
+    :alt: Coverage status
+
+`Github Repository <https://github.com/davidhalter/jedi>`_
 
 .. automodule:: jedi