diff --git a/product/ERP5/PropertySheet/DocumentPreference.py b/product/ERP5/PropertySheet/DocumentPreference.py
index 7a51b034dc0bf8702ac327c7cac64255ee40940d..a3b9bbedf9608ef47007d471351cf2be12063636 100644
--- a/product/ERP5/PropertySheet/DocumentPreference.py
+++ b/product/ERP5/PropertySheet/DocumentPreference.py
@@ -46,6 +46,13 @@ class DocumentPreference:
       'preference'  : 1,
       'write_permission': Permissions.ManageProperties,
       'mode'        : '' },
+    { 'id'          : 'preferred_ooodoc_server_timeout',
+      'description' : 'Timeout when connecting to the document conversion'
+                      ' server (in seconds)',
+      'type'        : 'int',
+      'preference'  : 1,
+      'write_permission': Permissions.ManageProperties,
+      'mode'        : '' },
     { 'id'          : 'preferred_document_reference_regular_expression',
       'description' : 'A regular expression to find and verify doc references',
       'type'        : 'string',
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view.xml
index 35262075df743e7527aff2b86d0a67b7bf0d742d..67c671238aa2aba34ed70f92cbbc6d862ff2330f 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view.xml
@@ -86,6 +86,7 @@
                         <string>my_preferred_time_zone</string>
                         <string>my_preferred_ooodoc_server_address</string>
                         <string>my_preferred_ooodoc_server_port_number</string>
+                        <string>my_preferred_ooodoc_server_timeout</string>
                         <string>my_preferred_hide_rows_on_no_search_criterion</string>
                         <string>my_translated_preference_state_title</string>
                       </list>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view/my_preferred_ooodoc_server_timeout.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view/my_preferred_ooodoc_server_timeout.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3fc82af59f8125e18061e10552d093ac578a378a
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view/my_preferred_ooodoc_server_timeout.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list>
+                <string>title</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>my_preferred_ooodoc_server_timeout</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string>my_integer_value</string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string>Base_viewFieldLibrary</string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string>Click to edit the target</string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Conversion Server Timeout</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index e0ae3053e7c7cbddb34b55bb6a377b1746122f3a..fe3b82ae25dcb6974a1540d71c32971b9ace2db5 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1790
\ No newline at end of file
+1791
\ No newline at end of file