--- scp2/source/ooo/common_brand.scp.alt	2008-09-10 14:39:37 +0400
+++ scp2/source/ooo/common_brand.scp	2008-09-10 16:30:33 +0400
@@ -777,7 +777,7 @@
   #elif defined MACOSX
     Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
   #else
-    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME";
   #endif
     StandaloneValue = "$ORIGIN/..";
 End
--- officecfg/registry/data/org/openoffice/Setup.xcu
+++ officecfg/registry/data/org/openoffice/Setup.xcu
@@ -776,7 +776,7 @@
 	</node>
 	<node oor:name="Migration">
 		<prop oor:name="SupportedVersions">
-                  <value oor:separator=",">OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
+                  <value oor:separator=",">OpenOffice.org 2=openoffice.org2.0,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
 		</prop>
 		<node oor:name="MigrationSteps">
 			<node oor:name="Datasources" oor:op="replace">