diff --git a/addons/mrp/data/mrp_demo.xml b/addons/mrp/data/mrp_demo.xml
index 84fe419296f..c69efe3dfb0 100644
--- a/addons/mrp/data/mrp_demo.xml
+++ b/addons/mrp/data/mrp_demo.xml
@@ -722,5 +722,18 @@
             <value eval="[ref('mrp.mrp_production_laptop_cust')]"/>
         </function>
 
+        <!-- set 'create component' as True for the demo manufacturing picking type
+        while leaving the default value to False for the others -->
+        <function model="stock.warehouse" name="write">
+            <value model="stock.warehouse" eval="obj().env['stock.warehouse'].search([]).ids"/>
+            <value eval="{'manufacture_to_resupply': True}"/>
+        </function>
+
+        <function model="stock.picking.type" name="write">
+            <value model="stock.picking.type" eval="obj().env['stock.picking.type'].search([('code', '=', 'mrp_operation')]).ids"/>
+            <value eval="{'use_create_components_lots': True}"/>
+        </function>
+
+
     </data>
 </odoo>