diff --git a/MANIFEST.in b/MANIFEST.in
index 97a95966de..25699556d2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
 include doc/*
diff --git a/company.xml b/company.xml
index 688c39e28e..d985d9b273 100644
--- a/company.xml
+++ b/company.xml
@@ -8,26 +8,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model">company.company</field>
             <field name="type">form</field>
             <field name="inherit" ref="company.company_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id=&quot;general&quot;]"
-                        position="after">
-                        <page string="Work Time" id="work_time">
-                            <label name="hours_per_work_day"/>
-                            <field name="hours_per_work_day"/>
-                            <label name="hours_per_work_week"/>
-                            <field name="hours_per_work_week"/>
-                            <label name="hours_per_work_month"/>
-                            <field name="hours_per_work_month"/>
-                            <label name="hours_per_work_year"/>
-                            <field name="hours_per_work_year"/>
-                        </page>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">company_form</field>
         </record>
 
     </data>
diff --git a/setup.py b/setup.py
index 24bdbfaa83..61f39396d0 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(name='trytond_company_work_time',
         ],
     package_data={
         'trytond.modules.company_work_time': (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/view/company_form.xml b/view/company_form.xml
new file mode 100644
index 0000000000..fe2ab3f041
--- /dev/null
+++ b/view/company_form.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
+        <page string="Work Time" id="work_time">
+            <label name="hours_per_work_day"/>
+            <field name="hours_per_work_day"/>
+            <label name="hours_per_work_week"/>
+            <field name="hours_per_work_week"/>
+            <label name="hours_per_work_month"/>
+            <field name="hours_per_work_month"/>
+            <label name="hours_per_work_year"/>
+            <field name="hours_per_work_year"/>
+        </page>
+    </xpath>
+</data>