diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 3ca206b4c..2706e24ca 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-10.0.20190528.0
\ No newline at end of file
+10.0.20190620.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index b57b70a6e..af3d5fbf4 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -61,6 +61,7 @@ setuptools.setup(
         'odoo10-addon-dbfilter_from_header',
         'odoo10-addon-dead_mans_switch_client',
         'odoo10-addon-disable_odoo_online',
+        'odoo10-addon-fetchmail_attach_from_folder',
         'odoo10-addon-fetchmail_notify_error_to_sender',
         'odoo10-addon-html_image_url_extractor',
         'odoo10-addon-html_text',
diff --git a/setup/fetchmail_attach_from_folder/odoo/__init__.py b/setup/fetchmail_attach_from_folder/odoo/__init__.py
new file mode 100644
index 000000000..de40ea7ca
--- /dev/null
+++ b/setup/fetchmail_attach_from_folder/odoo/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/setup/fetchmail_attach_from_folder/odoo/addons/__init__.py b/setup/fetchmail_attach_from_folder/odoo/addons/__init__.py
new file mode 100644
index 000000000..de40ea7ca
--- /dev/null
+++ b/setup/fetchmail_attach_from_folder/odoo/addons/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/setup/fetchmail_attach_from_folder/odoo/addons/fetchmail_attach_from_folder b/setup/fetchmail_attach_from_folder/odoo/addons/fetchmail_attach_from_folder
new file mode 120000
index 000000000..feaa017ce
--- /dev/null
+++ b/setup/fetchmail_attach_from_folder/odoo/addons/fetchmail_attach_from_folder
@@ -0,0 +1 @@
+../../../../fetchmail_attach_from_folder
\ No newline at end of file
diff --git a/setup/fetchmail_attach_from_folder/setup.py b/setup/fetchmail_attach_from_folder/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/fetchmail_attach_from_folder/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)