diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index fa6f189a262..0d0e10ffa44 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -297,6 +297,9 @@ class mrp_bom(osv.osv):
                 if not product or (set(map(int,bom_line_id.attribute_value_ids or [])) - set(map(int,product.attribute_value_ids))):
                     continue
 
+            if set(map(int, bom_line_id.property_ids or [])) - set(properties or []):
+                continue
+
             if previous_products and bom_line_id.product_id.product_tmpl_id.id in previous_products:
                 raise osv.except_osv(_('Invalid Action!'), _('BoM "%s" contains a BoM line with a product recursion: "%s".') % (master_bom.name,bom_line_id.product_id.name_get()[0][1]))
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index f2c47a0cb34..89af1189d79 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -384,6 +384,7 @@
                                     <field name="date_start"/>
                                     <field name="date_stop"/>
                                     <field name="attribute_value_ids" widget="many2many_tags" domain="[('product_ids.product_tmpl_id', '=', parent.product_tmpl_id)]"/>
+                                    <field name="property_ids" widget="many2many_tags"/>
                                 </tree>
                             </field>
                         </page>