diff --git a/AUTHORS b/AUTHORS
index 7d75865..923e1eb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,6 +2,10 @@ Written by
 ----------
 Andrea Stagi <a.stagi@nephila.it>
 
+Maintaned by
+------------
+Iacopo Spalletti <i.spalletti@nephila.it>
+
 Contributors
 ------------
 Moritz Lipp <github@mlq.me>
@@ -13,7 +17,8 @@ Jesús Espino <jespinog@gmail.com>
 Dennis Markgraf <info@dennismarkgraf.com>
 Paolo Romolini <p.romolini@nephila.it>
 David Barragán Merino <david.barragan@kaleidos.net>
-Iacopo Spalletti <i.spalletti@nephila.it>
 Mustafa Furkan Kaptan <kaptanmf@gmail.com>
 Christoph Meißner <post@christophmeissner.de>
-Maxence Adnot <contact@maxenceadnot.me>
\ No newline at end of file
+Maxence Adnot <contact@maxenceadnot.me>
+Robin Gustafsson <git@rgson.se>
+Daniel Federschmidt <daniel@federschmidt.xyz>
diff --git a/HISTORY.rst b/HISTORY.rst
index 4cc84bf..44ba994 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -11,6 +11,11 @@ History
 * Add support for multiple authentication backends
 * Add support for self-signed and not verified SSL certificates
 * Add support for webhooks
+* Add pagination support for lists
+* Add debian packaging
+* Avoid installing tests as a separate module
+* Move documentation to readthedocs
+* Add support for Python 3.5/3.6
 
 ******************
 0.8.6 (2016-08-26)
diff --git a/README.rst b/README.rst
index 83b8e7e..e36e617 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,7 @@
 python-taiga
 ============
 
-|Build Status| |Codecov.io Status| |Latest Version| |Supported Python
-versions| |License| |Downloads|
+|Gitter| |PyPiVersion| |PyVersion| |Status| |TestCoverage| |CodeClimate| |License|
 
 A module for using the `Taiga REST
 API <http://taigaio.github.io/taiga-doc/dist/api.html>`__.
@@ -211,15 +210,31 @@ You can access the history of issues, tasks, userstories and wiki pages:
 
 You can find a complete example in demo.py.
 
-.. |Build Status| image:: http://img.shields.io/travis/nephila/python-taiga.svg?branch=master
-   :target: https://travis-ci.org/nephila/python-taiga
-.. |Codecov.io Status| image:: https://img.shields.io/codecov/c/github/nephila/python-taiga.svg
-   :target: http://codecov.io/github/nephila/python-taiga?branch=master
-.. |Latest Version| image:: https://img.shields.io/pypi/v/python-taiga.svg
-   :target: https://pypi.python.org/pypi/python-taiga/
-.. |Supported Python versions| image:: https://img.shields.io/badge/python-2.6%2C%202.7%2C%203.3%2C%203.4%2C%203.5-blue.svg
-   :target: https://pypi.python.org/pypi/python-taiga/
-.. |License| image:: https://img.shields.io/github/license/nephila/python-taiga.svg
-   :target: https://pypi.python.org/pypi/python-taiga/
-.. |Downloads| image:: https://img.shields.io/pypi/dm/python-taiga.svg
+
+.. |Gitter| image:: https://img.shields.io/badge/GITTER-join%20chat-brightgreen.svg?style=flat-square
+    :target: https://gitter.im/nephila/applications
+    :alt: Join the Gitter chat
+
+.. |PyPiVersion| image:: https://img.shields.io/pypi/v/python-taiga.svg?style=flat-square
+    :target: https://pypi.python.org/pypi/python-taiga
+    :alt: Latest PyPI version
+
+.. |PyVersion| image:: https://img.shields.io/pypi/pyversions/python-taiga.svg?style=flat-square
+    :target: https://pypi.python.org/pypi/python-taiga
+    :alt: Python versions
+
+.. |Status| image:: https://img.shields.io/travis/nephila/python-taiga.svg?style=flat-square
+    :target: https://travis-ci.org/nephila/python-taiga
+    :alt: Latest Travis CI build status
+
+.. |TestCoverage| image:: https://img.shields.io/coveralls/nephila/python-taiga/master.svg?style=flat-square
+    :target: https://coveralls.io/r/nephila/python-taiga?branch=master
+    :alt: Test coverage
+
+.. |License| image:: https://img.shields.io/github/license/nephila/python-taiga.svg?style=flat-square
    :target: https://pypi.python.org/pypi/python-taiga/
+    :alt: License
+
+.. |CodeClimate| image:: https://codeclimate.com/github/nephila/python-taiga/badges/gpa.svg?style=flat-square
+   :target: https://codeclimate.com/github/nephila/python-taiga
+   :alt: Code Climate