--- openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu.orig	2005-04-18 20:39:35.000000000 +0530
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu	2005-05-10 17:30:14.000000000 +0530
@@ -40,6 +40,32 @@
     <prop oor:name="IsHideEmptyParagraphs" >
      <value>true</value>
     </prop>
+    <node oor:name="DataSource">
+     <prop oor:name="DataSourceName" oor:type="xs:string">
+      <value>EvolutionLocal</value>
+     </prop>
+     <prop oor:name="DataTableName" oor:type="xs:string">
+      <value>Personal</value>
+     </prop>
+    </node>
+    <node oor:name="AddressDataAssignments">
+     <node oor:name="_0" oor:op="replace">
+      <prop oor:name="DBColumnAssignments" oor:type="oor:string-list">
+       <value oor:separator=",">title,full_name,family_name,org,addr_line1,addr_line2,city,state,zip,country,home_phone,business_phone,email_1,</value>
+      </prop>
+      <node oor:name="DataSource">
+       <prop oor:name="DataCommandType" oor:type="xs:short">
+        <value>0</value>
+       </prop>
+       <prop oor:name="DataSourceName" oor:type="xs:string">
+        <value>EvolutionLocal</value>
+       </prop>
+       <prop oor:name="DataTableName" oor:type="xs:string">
+        <value>Personal</value>
+       </prop>
+      </node>
+     </node>
+    </node>
     <prop oor:name="EMailSupported">
      <value>true</value>
     </prop>
--- openoffice.org/extras/source/database/makefile.mk.bakj	2005-03-16 18:49:33.251075928 +0530
+++ openoffice.org/extras/source/database/makefile.mk	2005-03-16 18:50:38.651285353 +0530
@@ -72,8 +72,8 @@
 
 ZIP1TARGET      = $(DATABASE_USER_TARGET)
 
-ZIP1LIST        = biblio.odb
-
+ZIP1LIST        = biblio.odb \
+		  evolocal.odb	
 ZIP2TARGET      = $(DATABASE_USER_BIBLIO_TARGET)
 
 ZIP2LIST        = biblio.dbf biblio.dbt
--- openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu.bakj	2005-03-16 18:51:43.777536725 +0530
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu	2005-03-16 18:52:51.471404727 +0530
@@ -161,6 +161,14 @@
 			<value>Bibliography</value>
 		</prop>
 	</node>
+    <node oor:name="EvolutionLocal" oor:op="replace">
+		<prop oor:name="Location" oor:type="xs:string">
+			<value>$(userurl)/database/evolocal.odb</value>
+		</prop>
+		<prop oor:name="Name" oor:type="xs:string">
+			<value>EvolutionLocal</value>
+		</prop>
+	</node>
   </node>
   <node oor:name="Bibliography">
     <node oor:name="CurrentDataSource">
--- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx	19 Dec 2005 17:26:24 -0000	1.13
+++ openoffice.org/extensions/source/abpilot/abspilot.cxx	16 Feb 2006 12:45:38 -0000
@@ -124,12 +124,8 @@
 		// some initial settings
 #ifdef MACOSX
         m_aSettings.eType = AST_MACAB;
-#elif WITH_MOZILLA
-#ifdef UNX
-		m_aSettings.eType = AST_MORK;
-#else
-		m_aSettings.eType = AST_OE;
-#endif
+#elif UNX
+		m_aSettings.eType = AST_EVOLUTION;
 #else
 		m_aSettings.eType = AST_OTHER;
 #endif