diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 0d5a526ef..879b65f6a 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-10.0.20180511.0
\ No newline at end of file
+10.0.20180616.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 570db0b4c..37cbf0142 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -12,6 +12,7 @@ setuptools.setup(
         'odoo10-addon-auditlog',
         'odoo10-addon-auth_admin_passkey',
         'odoo10-addon-auth_brute_force',
+        'odoo10-addon-auth_oauth_multi_token',
         'odoo10-addon-auth_session_timeout',
         'odoo10-addon-auth_signup_verify_email',
         'odoo10-addon-auth_supplier',
diff --git a/setup/auth_oauth_multi_token/odoo/__init__.py b/setup/auth_oauth_multi_token/odoo/__init__.py
new file mode 100644
index 000000000..de40ea7ca
--- /dev/null
+++ b/setup/auth_oauth_multi_token/odoo/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/setup/auth_oauth_multi_token/odoo/addons/__init__.py b/setup/auth_oauth_multi_token/odoo/addons/__init__.py
new file mode 100644
index 000000000..de40ea7ca
--- /dev/null
+++ b/setup/auth_oauth_multi_token/odoo/addons/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/setup/auth_oauth_multi_token/odoo/addons/auth_oauth_multi_token b/setup/auth_oauth_multi_token/odoo/addons/auth_oauth_multi_token
new file mode 120000
index 000000000..fdcdcb499
--- /dev/null
+++ b/setup/auth_oauth_multi_token/odoo/addons/auth_oauth_multi_token
@@ -0,0 +1 @@
+../../../../auth_oauth_multi_token
\ No newline at end of file
diff --git a/setup/auth_oauth_multi_token/setup.py b/setup/auth_oauth_multi_token/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/auth_oauth_multi_token/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)