diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index c3372e41..0cfd27b9 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-11.0.20180516.0
\ No newline at end of file
+11.0.20180618.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 96a6442d..e8a29a22 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -8,12 +8,15 @@ setuptools.setup(
     description="Meta package for oca-social Odoo addons",
     version=version,
     install_requires=[
+        'odoo11-addon-base_search_mail_content',
         'odoo11-addon-email_template_qweb',
+        'odoo11-addon-mail_attach_existing_attachment',
         'odoo11-addon-mail_debrand',
         'odoo11-addon-mail_digest',
         'odoo11-addon-mail_restrict_follower_selection',
         'odoo11-addon-mail_tracking',
         'odoo11-addon-mail_tracking_mailgun',
+        'odoo11-addon-mass_mailing_custom_unsubscribe',
     ],
     classifiers=[
         'Programming Language :: Python',
diff --git a/setup/base_search_mail_content/odoo/addons/base_search_mail_content b/setup/base_search_mail_content/odoo/addons/base_search_mail_content
new file mode 120000
index 00000000..c56a3d68
--- /dev/null
+++ b/setup/base_search_mail_content/odoo/addons/base_search_mail_content
@@ -0,0 +1 @@
+../../../../base_search_mail_content
\ No newline at end of file
diff --git a/setup/base_search_mail_content/setup.cfg b/setup/base_search_mail_content/setup.cfg
new file mode 100644
index 00000000..3c6e79cf
--- /dev/null
+++ b/setup/base_search_mail_content/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff --git a/setup/base_search_mail_content/setup.py b/setup/base_search_mail_content/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/base_search_mail_content/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/mail_attach_existing_attachment/odoo/addons/mail_attach_existing_attachment b/setup/mail_attach_existing_attachment/odoo/addons/mail_attach_existing_attachment
new file mode 120000
index 00000000..d7f3725c
--- /dev/null
+++ b/setup/mail_attach_existing_attachment/odoo/addons/mail_attach_existing_attachment
@@ -0,0 +1 @@
+../../../../mail_attach_existing_attachment
\ No newline at end of file
diff --git a/setup/mail_attach_existing_attachment/setup.cfg b/setup/mail_attach_existing_attachment/setup.cfg
new file mode 100644
index 00000000..3c6e79cf
--- /dev/null
+++ b/setup/mail_attach_existing_attachment/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff --git a/setup/mail_attach_existing_attachment/setup.py b/setup/mail_attach_existing_attachment/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/mail_attach_existing_attachment/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/mass_mailing_custom_unsubscribe/odoo/addons/mass_mailing_custom_unsubscribe b/setup/mass_mailing_custom_unsubscribe/odoo/addons/mass_mailing_custom_unsubscribe
new file mode 120000
index 00000000..d45321be
--- /dev/null
+++ b/setup/mass_mailing_custom_unsubscribe/odoo/addons/mass_mailing_custom_unsubscribe
@@ -0,0 +1 @@
+../../../../mass_mailing_custom_unsubscribe
\ No newline at end of file
diff --git a/setup/mass_mailing_custom_unsubscribe/setup.cfg b/setup/mass_mailing_custom_unsubscribe/setup.cfg
new file mode 100644
index 00000000..3c6e79cf
--- /dev/null
+++ b/setup/mass_mailing_custom_unsubscribe/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff --git a/setup/mass_mailing_custom_unsubscribe/setup.py b/setup/mass_mailing_custom_unsubscribe/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/mass_mailing_custom_unsubscribe/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)