diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index f6c6392b4..93b73943c 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-11.0.20180424.0
\ No newline at end of file
+11.0.20180526.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 3cec71cb1..6ba179926 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -17,6 +17,7 @@ setuptools.setup(
         'odoo11-addon-web_no_bubble',
         'odoo11-addon-web_notify',
         'odoo11-addon-web_responsive',
+        'odoo11-addon-web_search_with_and',
         'odoo11-addon-web_searchbar_full_width',
         'odoo11-addon-web_sheet_full_width',
         'odoo11-addon-web_timeline',
diff --git a/setup/web_action_conditionable/odoo/__init__.py b/setup/web_action_conditionable/odoo/__init__.py
deleted file mode 100644
index de40ea7ca..000000000
--- a/setup/web_action_conditionable/odoo/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/setup/web_action_conditionable/odoo/addons/__init__.py b/setup/web_action_conditionable/odoo/addons/__init__.py
deleted file mode 100644
index de40ea7ca..000000000
--- a/setup/web_action_conditionable/odoo/addons/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/setup/web_search_with_and/odoo/addons/web_search_with_and b/setup/web_search_with_and/odoo/addons/web_search_with_and
new file mode 120000
index 000000000..d32981712
--- /dev/null
+++ b/setup/web_search_with_and/odoo/addons/web_search_with_and
@@ -0,0 +1 @@
+../../../../web_search_with_and
\ No newline at end of file
diff --git a/setup/web_search_with_and/setup.cfg b/setup/web_search_with_and/setup.cfg
new file mode 100644
index 000000000..3c6e79cf3
--- /dev/null
+++ b/setup/web_search_with_and/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff --git a/setup/web_search_with_and/setup.py b/setup/web_search_with_and/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/web_search_with_and/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)