diff --git a/addons/mrp/models/__init__.py b/addons/mrp/models/__init__.py
index 011d288123a..a349e45182f 100644
--- a/addons/mrp/models/__init__.py
+++ b/addons/mrp/models/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import ir_attachment
+from . import mrp_document
 from . import mrp_config_settings
 from . import mrp_bom
 from . import mrp_message
diff --git a/addons/mrp/models/ir_attachment.py b/addons/mrp/models/ir_attachment.py
deleted file mode 100644
index acdf42a5983..00000000000
--- a/addons/mrp/models/ir_attachment.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class IrAttachment(models.Model):
-    _inherit = 'ir.attachment'
-    _order = "priority desc, id desc"
-
-    priority = fields.Selection([
-        ('0', 'Normal'),
-        ('1', 'Low'),
-        ('2', 'High'),
-        ('3', 'Very High')], string="Priority", help="Gives the sequence order when displaying a list of tasks.")
diff --git a/addons/mrp/models/mrp_bom.py b/addons/mrp/models/mrp_bom.py
index fb248b9a59e..e4fef9f58cd 100644
--- a/addons/mrp/models/mrp_bom.py
+++ b/addons/mrp/models/mrp_bom.py
@@ -262,7 +262,7 @@ class MrpBomLine(models.Model):
         return {
             'name': _('Attachments'),
             'domain': domain,
-            'res_model': 'ir.attachment',
+            'res_model': 'mrp.document',
             'type': 'ir.actions.act_window',
             'view_id': attachment_view.id,
             'views': [(attachment_view.id, 'kanban'), (False, 'form')],
diff --git a/addons/mrp/models/mrp_document.py b/addons/mrp/models/mrp_document.py
new file mode 100644
index 00000000000..01cdc4b7845
--- /dev/null
+++ b/addons/mrp/models/mrp_document.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class MrpDocument(models.Model):
+    """ Extension of ir.attachment only used in MRP to handle archivage
+    and basic versioning.
+    """
+    _name = 'mrp.document'
+    _inherits = {
+        'ir.attachment': 'ir_attachment_id',
+    }
+    _order = "priority desc, id desc"
+
+    ir_attachment_id = fields.Many2one('ir.attachment', string='Related attachment', required=True, ondelete='cascade')
+    active = fields.Boolean('Active', default=True)
+    priority = fields.Selection([
+        ('0', 'Normal'),
+        ('1', 'Low'),
+        ('2', 'High'),
+        ('3', 'Very High')], string="Priority", help='Gives the sequence order when displaying a list of MRP documents.')
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 47a7e677285..e82ca628e9c 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -60,3 +60,5 @@ access_mrp_message_mrp_user,mrp.message,model_mrp_message,group_mrp_user,1,0,0,0
 access_mrp_message_mrp_manager,mrp.message,model_mrp_message,group_mrp_manager,1,1,1,1
 access_stock_move_lots,stock.move.lots,model_stock_move_lots,group_mrp_user,1,1,1,0
 access_stock_move_lots_manager,stock.move.lots,model_stock_move_lots,group_mrp_manager,1,1,1,1
+access_mrp_document_mrp_manager,mrp.document group_user,model_mrp_document,group_mrp_manager,1,1,1,1
+access_mrp_document_mrp_user,mrp.document group_user,model_mrp_document,group_mrp_user,1,1,1,1
\ No newline at end of file
diff --git a/addons/mrp/views/ir_attachment_view.xml b/addons/mrp/views/ir_attachment_view.xml
index 4ac0dd9035a..49fdf2c6037 100644
--- a/addons/mrp/views/ir_attachment_view.xml
+++ b/addons/mrp/views/ir_attachment_view.xml
@@ -2,8 +2,8 @@
 <odoo>
         <!-- Files -->
     <record model="ir.ui.view" id="view_document_file_kanban_mrp">
-        <field name="name">ir.attachment kanban.mrp</field>
-        <field name="model">ir.attachment</field>
+        <field name="name">mrp.document kanban.mrp</field>
+        <field name="model">mrp.document</field>
         <field name="arch" type="xml">
             <kanban>
                 <field name="id"/>
@@ -43,4 +43,16 @@
             </kanban>
         </field>
     </record>
+
+    <record id="view_document_form" model="ir.ui.view">
+        <field name="name">mrp.document.form</field>
+        <field name="model">mrp.document</field>
+        <field name="inherit_id" ref="base.view_attachment_form"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+          <xpath expr="//field[@name='mimetype']" position="after">
+              <field name="priority" widget="priority"/>
+          </xpath>
+        </field>
+    </record>
 </odoo>