diff --git a/dbfilter_from_header/README.rst b/dbfilter_from_header/README.rst
new file mode 100644
index 000000000..2b9626afd
--- /dev/null
+++ b/dbfilter_from_header/README.rst
@@ -0,0 +1,62 @@
+.. 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
+
+====================
+dbfilter_from_header
+====================
+
+This addon lets you pass a dbfilter as a HTTP header.
+
+This is interesting for setups where database names can't be mapped to proxied host names.
+
+Configuration
+=============
+
+In nginx, use one of:
+
+* proxy_set_header X-OpenERP-dbfilter [your filter];
+* proxy_set_header X-Odoo-dbfilter [your filter];
+
+This addon has to be loaded as server-wide module.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/server-tools/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
+<https://github.com/OCA/
+server-tools/issues/new?body=module:%20
+dbfilter_from_header%0Aversion:%20
+9.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Credits
+=======
+
+Contributors
+------------
+
+* Stéphane Bidoul <stephane.bidoul@acsone.eu>
+* Yannick Vaucher <yannick.vaucher@camptocamp.com>
+* Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
+* Holger Brunn <hbrunn@therp.nl>
+* Laurent Mignon (aka lmi) <laurent.mignon@acsone.eu>
+* Sandy Carter <sandy.carter@savoirfairelinux.com>
+* Fabio Vilchez <fabio.vilchez@clearcorp.co.cr>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/dbfilter_from_header/__init__.py b/dbfilter_from_header/__init__.py
index 14138f080..63ebcefb4 100644
--- a/dbfilter_from_header/__init__.py
+++ b/dbfilter_from_header/__init__.py
@@ -1,24 +1,8 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    This module copyright (C) 2013 Therp BV (<http://therp.nl>).
-#    This module copyright (C) 2014 ACSONE SA/NV (<http://acsone.eu>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2013  Therp BV
+# © 2014  ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
 import re
 from openerp import http
 
diff --git a/dbfilter_from_header/__openerp__.py b/dbfilter_from_header/__openerp__.py
index 32b2651ab..fc337b896 100644
--- a/dbfilter_from_header/__openerp__.py
+++ b/dbfilter_from_header/__openerp__.py
@@ -1,41 +1,15 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    This module copyright (C) 2013 Therp BV (<http://therp.nl>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2013  Therp BV
+# © 2014  ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
 {
     "name": "dbfilter_from_header",
+    "summary": "Filter databases with HTTP headers",
     "version": "9.0.1.0.0",
     "author": "Therp BV,Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "complexity": "normal",
-    "description": """
-    This addon lets you pass a dbfilter as a HTTP header.
-
-    This is interesting for setups where database names can't be mapped to
-    proxied host names.
-
-    In nginx, use one of
-    proxy_set_header X-OpenERP-dbfilter [your filter];
-    proxy_set_header X-Odoo-dbfilter [your filter];
-
-    The addon has to be loaded as server-wide module.
-    """,
     "category": "Tools",
     "depends": [
         'web',