diff --git a/shell/ChangeLog b/shell/ChangeLog
index 0edec5bb65..a7f732deb9 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-24  Andre Klapper  <a9016009@gmx.de>:
+	
+	Reviewed and committed by Harish <kharish@novell.com>
+
+	* shell.error.xml: fixed two dead links to "support.ximian.com" now to
+	the (yet to come) FAQ at go-evolution.org. (#315866)
+
+
 2005-12-22  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
 	* Evolution-Component.idl
diff --git a/shell/shell.error.xml b/shell/shell.error.xml
index e746cc0dfa..da489b3547 100644
--- a/shell/shell.error.xml
+++ b/shell/shell.error.xml
@@ -57,7 +57,7 @@ Once deleted, you cannot downgrade to the previous version of Evolution without
   <_secondary xml:space="preserve">Your system configuration does not match your Evolution configuration.
 
 Click help for details</_secondary>
-  <help uri="http://support.ximian.com/q?54"/>
+  <help uri="http://go-evolution.org/FAQ#What_does_.22Your_system_configuration_does_not_match_your_Evolution_configuration.22_mean.3F"/>
   <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
  </error>
 
@@ -69,13 +69,13 @@ Click help for details</_secondary>
 {0}
 
 Click help for details.</_secondary>
-  <help uri="http://support.ximian.com/q?54"/>
+  <help uri="http://go-evolution.org/FAQ#What_does_.22Your_system_configuration_does_not_match_your_Evolution_configuration.22_mean.3F"/>
   <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
  </error>
 
  <error id="forget-passwords" type="question" default="GTK_RESPONSE_OK">
-  <_primary>Are you sure you want to forget all remembered passwords? </_primary>
-  <_secondary xml:space="preserve">Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed. </_secondary>
+  <_primary>Are you sure you want to forget all remembered passwords?</_primary>
+  <_secondary xml:space="preserve">Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed.</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
   <button _label="_Forget" response="GTK_RESPONSE_OK"/>
  </error>