--- officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -705,4 +705,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>
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old	2012-03-01 15:34:22.000000000 +0100
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2012-03-01 15:54:05.000000000 +0100
@@ -1897,6 +1897,10 @@
             sub-folders.</desc>
           </info>
           <value>
+            <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>$(insturl)/share/template/$(vlang)</it>
             <it>$(insturl)/share/template/common</it>
             <it>$(userurl)/template</it>
@@ -2090,6 +2094,10 @@
             are located in folders and sub-folders.</desc>
           </info>
           <value>
+            <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>$(insturl)/share/template/$(vlang)</it>
             <it>$(insturl)/share/template/common</it>
             <it>$(userurl)/template</it>