diff --git a/dbfilter_from_header/__openerp__.py b/dbfilter_from_header/__openerp__.py
index 4570e55d5..f6c5d0388 100644
--- a/dbfilter_from_header/__openerp__.py
+++ b/dbfilter_from_header/__openerp__.py
@@ -21,7 +21,7 @@
 {
     "name": "dbfilter_from_header",
     "version": "1.0",
-    "author": "Therp BV",
+    "author": "Therp BV,Odoo Community Association (OCA)",
     "complexity": "normal",
     "description": """
     This addon lets you pass a dbfilter as a HTTP header.
diff --git a/email_template_template/__openerp__.py b/email_template_template/__openerp__.py
index 3b7b942a1..0fad0fa81 100644
--- a/email_template_template/__openerp__.py
+++ b/email_template_template/__openerp__.py
@@ -21,7 +21,7 @@
 {
     "name": "Templates for email templates",
     "version": "1.0",
-    "author": "Therp BV",
+    "author": "Therp BV,Odoo Community Association (OCA)",
     "category": 'Tools',
     'complexity': "expert",
     "description": """If an organisation's email layout is a bit more
diff --git a/fetchmail_attach_from_folder/__openerp__.py b/fetchmail_attach_from_folder/__openerp__.py
index 6e16b690a..c6203d958 100644
--- a/fetchmail_attach_from_folder/__openerp__.py
+++ b/fetchmail_attach_from_folder/__openerp__.py
@@ -31,7 +31,7 @@
     This gives a simple possibility to archive emails in OpenERP without a mail
     client integration.
     """,
-    'author': 'Therp BV',
+    'author': "Therp BV,Odoo Community Association (OCA)",
     'website': 'http://www.therp.nl',
     "category": "Tools",
     "depends": ['fetchmail'],
diff --git a/ir_config_parameter_viewer/__openerp__.py b/ir_config_parameter_viewer/__openerp__.py
index 8d543af33..a04893a0c 100644
--- a/ir_config_parameter_viewer/__openerp__.py
+++ b/ir_config_parameter_viewer/__openerp__.py
@@ -9,7 +9,7 @@
  'description': """
    Create view to inspect/change technical parameters
  """,
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'website': 'http://openerp.camptocamp.com',
  'depends': ['base'],
  'init_xml': [],
diff --git a/mail_client_view/__openerp__.py b/mail_client_view/__openerp__.py
index b00cef277..85848df74 100644
--- a/mail_client_view/__openerp__.py
+++ b/mail_client_view/__openerp__.py
@@ -33,7 +33,7 @@
     button 'confirm action done' (if action needed), or the button 'set
     action needed.
     ''',
-    'author': 'Therp BV',
+    'author': "Therp BV,Odoo Community Association (OCA)",
     'website': 'http://www.therp.nl',
     'category': 'Tools',
     'depends': ['mail'],
diff --git a/mail_environment/__openerp__.py b/mail_environment/__openerp__.py
index 8ccaae570..75d836caa 100644
--- a/mail_environment/__openerp__.py
+++ b/mail_environment/__openerp__.py
@@ -56,7 +56,7 @@ password = openerp
 
 
     """,
-    'author': 'Camptocamp',
+    'author': "Camptocamp,Odoo Community Association (OCA)",
     'license': 'AGPL-3',
     'website': 'http://openerp.camptocamp.com',
     'depends': [
diff --git a/mass_editing/__openerp__.py b/mass_editing/__openerp__.py
index 8f7611bbf..39decd372 100644
--- a/mass_editing/__openerp__.py
+++ b/mass_editing/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name": "Mass Editing",
     "version": "1.1",
-    "author": "Serpent Consulting Services",
+    "author": "Serpent Consulting Services,Odoo Community Association (OCA)",
     "category": "Tools",
     "website": "http://www.serpentcs.com",
     "description": """This module provides the functionality to add, update or
diff --git a/security_protector/__openerp__.py b/security_protector/__openerp__.py
index fce7d079f..7c89e3e34 100644
--- a/security_protector/__openerp__.py
+++ b/security_protector/__openerp__.py
@@ -15,7 +15,7 @@
     you can deactivate this behavior in ir.config_parameter by chanching the
     protect_security? key to 0
  """,
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'website': 'http://openerp.camptocamp.com',
  'depends': ['base'],
  'init_xml': ['data.xml'],
diff --git a/server_env_base_external_referentials/__openerp__.py b/server_env_base_external_referentials/__openerp__.py
index 1f56f0067..927b44ef6 100644
--- a/server_env_base_external_referentials/__openerp__.py
+++ b/server_env_base_external_referentials/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "Server environment for base_external_referential",
     "version": "1.0",
     "depends": ["base", 'server_environment', 'base_external_referentials'],
-    "author": "Camptocamp",
+    "author": "Camptocamp,Odoo Community Association (OCA)",
     'license': 'AGPL-3',
     "description": """This module is based on the server_environment module to
 use files for configuration. Thus we can have a different file for each
diff --git a/server_environment/__openerp__.py b/server_environment/__openerp__.py
index f4c3b29ba..24c19b79e 100644
--- a/server_environment/__openerp__.py
+++ b/server_environment/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "server configuration environment files",
     "version": "1.0",
     "depends": ["base", "server_environment_files"],
-    "author": "Camptocamp",
+    "author": "Camptocamp,Odoo Community Association (OCA)",
     "description": """\
 Environment file pattern for OpenERP
 ====================================
diff --git a/server_environment_files/__openerp__.py b/server_environment_files/__openerp__.py
index fb16a51a4..0d2077134 100644
--- a/server_environment_files/__openerp__.py
+++ b/server_environment_files/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "Example server configuration environment files repository module",
     "version": "1.0",
     "depends": ["base"],
-    "author": "Camptocamp",
+    "author": "Camptocamp,Odoo Community Association (OCA)",
     "description": """\
 File store for environment file sample module
 =============================================
diff --git a/super_calendar/__openerp__.py b/super_calendar/__openerp__.py
index 0cf94f798..7ea7b5b78 100644
--- a/super_calendar/__openerp__.py
+++ b/super_calendar/__openerp__.py
@@ -74,7 +74,7 @@ filtering by ‘Configurator’ (if you have several configurators, ‘Scheduled
 calls and meetings’ can be one of them) and by your user. Once you filtered,
 you can save the filter as ‘Advanced filter’ or even add it to a dashboard.
 """,
-    'author': 'Agile Business Group',
+    'author': "Agile Business Group,Odoo Community Association (OCA)",
     'website': 'http://www.agilebg.com',
     'license': 'AGPL-3',
     'depends': ['base'],
diff --git a/unserialize_field/__openerp__.py b/unserialize_field/__openerp__.py
index b639ce348..6b5b7269f 100644
--- a/unserialize_field/__openerp__.py
+++ b/unserialize_field/__openerp__.py
@@ -35,7 +35,7 @@ of such fields is the Magento-OpenERP connector.
 
 For technical reasons, many2many and one2many fields are not supported.
 """,
-    'author': 'Therp BV',
+    'author': "Therp BV,Odoo Community Association (OCA)",
     'website': 'http://www.therp.nl',
     'version': '1.0',
     "category": "Tools",