diff --git a/odoo/addons/base/__manifest__.py b/odoo/addons/base/__manifest__.py
index 2238a728a72..51f5ba3a9f6 100644
--- a/odoo/addons/base/__manifest__.py
+++ b/odoo/addons/base/__manifest__.py
@@ -60,7 +60,6 @@ The kernel of Odoo, needed for all installation.
         'data/res_partner_data.xml',
         'res/ir_property_view.xml',
         'res/res_config_settings_views.xml',
-        'res/res_security.xml',
         'res/report_paperformat_views.xml',
         'security/ir.model.access.csv',
     ],
diff --git a/odoo/addons/base/ir/ir_filters.xml b/odoo/addons/base/ir/ir_filters.xml
index af36573a8f1..7faf7ded0b7 100644
--- a/odoo/addons/base/ir/ir_filters.xml
+++ b/odoo/addons/base/ir/ir_filters.xml
@@ -1,44 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
-        <!-- Restrict modifications on ir.filters to owner only -->
-        <record id="ir_filters_admin_all_rights_rule" model="ir.rule">
-            <field name="name">ir.filters.admin.all.rights</field>
-            <field name="model_id" ref="model_ir_filters"/>
-            <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="groups" eval="[(4, ref('base.group_erp_manager'))]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
-        </record>
-
-        <record id="ir_filters_employee_rule" model="ir.rule">
-            <field name="name">ir.filters.owner</field>
-            <field name="model_id" ref="model_ir_filters"/>
-            <field name="domain_force">[('user_id','in',[False,user.id])]</field>
-            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
-            <field name="perm_unlink" eval="False"/>
-        </record>
-
-        <record id="ir_filters_delete_own_rule" model="ir.rule">
-            <field name="name">ir.filters.own.rule.delete</field>
-            <field name="model_id" ref="model_ir_filters"/>
-            <field name="domain_force">[('user_id', '=', user.id)]</field>
-            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-        </record>
-
-        <record id="ir_filters_portal_public_rule" model="ir.rule">
-            <field name="name">ir.filter: portal/public</field>
-            <field name="model_id" ref="model_ir_filters"/>
-            <field name="domain_force">[('user_id', '=', user.id)]</field>
-            <field name="groups" eval="[(4, ref('base.group_portal')), (4, ref('base.group_public'))]"/>
-        </record>
-    </data>
-
     <data>
         <record id="ir_filters_view_form" model="ir.ui.view">
             <field name="model">ir.filters</field>
diff --git a/odoo/addons/base/res/res_security.xml b/odoo/addons/base/res/res_security.xml
deleted file mode 100644
index a442f3cbbf5..00000000000
--- a/odoo/addons/base/res/res_security.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-
-        <!-- Record Rules For Company -->
-        <record id="res_company_rule_portal" model="ir.rule">
-            <field name="name">company rule portal</field>
-            <field name="model_id" ref="model_res_company"/>
-            <field eval="False" name="global"/>
-            <field name="groups" eval="[(6, 0, [ref('base.group_portal')])]"/>
-            <field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
-        </record>
-        <record id="res_company_rule_employee" model="ir.rule">
-            <field name="name">company rule employee</field>
-            <field name="model_id" ref="model_res_company"/>
-            <field eval="False" name="global"/>
-            <field name="groups" eval="[(6, 0, [ref('base.group_user')])]"/>
-            <field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
-        </record>
-        <record id="res_company_rule_public" model="ir.rule">
-            <field name="name">company rule public</field>
-            <field name="model_id" ref="model_res_company"/>
-            <field eval="False" name="global"/>
-            <field name="groups" eval="[(6, 0, [ref('base.group_public')])]"/>
-            <field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
-        </record>
-        <record id="res_company_rule_erp_manager" model="ir.rule">
-            <field name="name">company rule erp manager</field>
-            <field name="model_id" ref="model_res_company"/>
-            <field eval="False" name="global"/>
-            <field name="groups" eval="[(6, 0, [ref('base.group_erp_manager')])]"/>
-            <field name="domain_force">[(1,'=',1)]</field>
-        </record>
-
-        <!-- Record Rule For User -->
-        <record id="res_users_rule" model="ir.rule">
-            <field name="name">user rule</field>
-            <field name="model_id" ref="model_res_users"/>
-            <field eval="True" name="global"/>
-            <field name="domain_force">[('company_ids','child_of',[user.company_id.id])]</field>
-        </record>
-
-    </data>
-</odoo>
diff --git a/odoo/addons/base/security/base_security.xml b/odoo/addons/base/security/base_security.xml
index 3330118f354..6f0d59e88d8 100644
--- a/odoo/addons/base/security/base_security.xml
+++ b/odoo/addons/base/security/base_security.xml
@@ -143,6 +143,80 @@
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
 
+        <!-- Restrict modifications on ir.filters to owner only -->
+        <record id="ir_filters_admin_all_rights_rule" model="ir.rule">
+            <field name="name">ir.filters.admin.all.rights</field>
+            <field name="model_id" ref="model_ir_filters"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('base.group_erp_manager'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
+        </record>
+
+        <record id="ir_filters_employee_rule" model="ir.rule">
+            <field name="name">ir.filters.owner</field>
+            <field name="model_id" ref="model_ir_filters"/>
+            <field name="domain_force">[('user_id','in',[False,user.id])]</field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+
+        <record id="ir_filters_delete_own_rule" model="ir.rule">
+            <field name="name">ir.filters.own.rule.delete</field>
+            <field name="model_id" ref="model_ir_filters"/>
+            <field name="domain_force">[('user_id', '=', user.id)]</field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+        </record>
+
+        <record id="ir_filters_portal_public_rule" model="ir.rule">
+            <field name="name">ir.filter: portal/public</field>
+            <field name="model_id" ref="model_ir_filters"/>
+            <field name="domain_force">[('user_id', '=', user.id)]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal')), (4, ref('base.group_public'))]"/>
+        </record>
+
+        <!-- Record Rules For Company -->
+        <record id="res_company_rule_portal" model="ir.rule">
+            <field name="name">company rule portal</field>
+            <field name="model_id" ref="model_res_company"/>
+            <field eval="False" name="global"/>
+            <field name="groups" eval="[(6, 0, [ref('base.group_portal')])]"/>
+            <field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
+        </record>
+        <record id="res_company_rule_employee" model="ir.rule">
+            <field name="name">company rule employee</field>
+            <field name="model_id" ref="model_res_company"/>
+            <field eval="False" name="global"/>
+            <field name="groups" eval="[(6, 0, [ref('base.group_user')])]"/>
+            <field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
+        </record>
+        <record id="res_company_rule_public" model="ir.rule">
+            <field name="name">company rule public</field>
+            <field name="model_id" ref="model_res_company"/>
+            <field eval="False" name="global"/>
+            <field name="groups" eval="[(6, 0, [ref('base.group_public')])]"/>
+            <field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
+        </record>
+        <record id="res_company_rule_erp_manager" model="ir.rule">
+            <field name="name">company rule erp manager</field>
+            <field name="model_id" ref="model_res_company"/>
+            <field eval="False" name="global"/>
+            <field name="groups" eval="[(6, 0, [ref('base.group_erp_manager')])]"/>
+            <field name="domain_force">[(1,'=',1)]</field>
+        </record>
+
+        <!-- Record Rule For User -->
+        <record id="res_users_rule" model="ir.rule">
+            <field name="name">user rule</field>
+            <field name="model_id" ref="model_res_users"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">[('company_ids','child_of',[user.company_id.id])]</field>
+        </record>
     </data>
 </odoo>