Index: officecfg/registry/data/org/openoffice/Office/Common.xcu
===================================================================
--- officecfg/registry/data/org/openoffice/Office/Common.xcu.orig
+++ officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -727,4 +727,6 @@
           "com.sun.star.configuration.backend.GconfBackend OpenGL_Faster"/>
     </prop>
   </node>
+  <!-- FIXME: This comment is needed to change a checksum or so.
+              Then the updated list of templates paths is read from Common.xcs-->
 </oor:component-data>
Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs
===================================================================
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.orig
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1965,6 +1965,10 @@
           <value>
             <it>$(insturl)/share/template/$(vlang)</it>
             <it>$(insturl)/share/template/common</it>
+            <it>file:///usr/share/templates/libreoffice/common</it>
+            <it>file:///usr/share/templates/libreoffice/$(vlang)</it>
+            <it>file:///usr/share/templates/ooo/common</it>
+            <it>file:///usr/share/templates/ooo/$(vlang)</it>
             <it>$(userurl)/template</it>
           </value>
         </prop>
@@ -2165,6 +2169,10 @@
           <value>
             <it>$(insturl)/share/template/$(vlang)</it>
             <it>$(insturl)/share/template/common</it>
+            <it>file:///usr/share/templates/libreoffice/common</it>
+            <it>file:///usr/share/templates/libreoffice/$(vlang)</it>
+            <it>file:///usr/share/templates/ooo/common</it>
+            <it>file:///usr/share/templates/ooo/$(vlang)</it>
             <it>$(userurl)/template</it>
           </value>
         </prop>