diff --git a/base_location/README.rst b/base_location/README.rst
index 0fb7de7a5..f9d4d0dcc 100644
--- a/base_location/README.rst
+++ b/base_location/README.rst
@@ -1,3 +1,8 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+=======================
 Enhanced ZIP management
 =======================
 
@@ -7,6 +12,23 @@ It enables zip, city, state and country auto-completion on partners and companie
 
 Also allows different search filters.
 
+Usage
+=====
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/134/9.0
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/
+partner_contact/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here <https://github.com/OCA/
+partner_contact/issues/new?body=module:%20
+base_location%0Aversion:%20
+9.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Credits
 =======
@@ -14,7 +36,7 @@ Credits
 Contributors
 ------------
 
-* Nicolas Bessi. (Copyright Camptocamp SA)
+* Nicolas Bessi (Camptocamp)
 * Ignacio Ibeas (Acysos S.L.)
 * Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
 * Alejandro Santana <alejandrosantana@anubia.es>