diff --git a/shell/ChangeLog b/shell/ChangeLog
index 47c6e222ec..0405cad584 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-18  Tor Lillqvist  <tml@novell.com>
+
+	* GNOME_Evolution_Shell.server.in.in: Use EXEEXT.
+
+	* GNOME_Evolution_Test.server.in.in: Use SOEXT.
+
 2005-06-02  Not Zed  <NotZed@Ximian.com>
 
 	* Evolution.*.idl: Fix so these are only ever included once.
diff --git a/shell/GNOME_Evolution_Shell.server.in.in b/shell/GNOME_Evolution_Shell.server.in.in
index bb8a69f2bf..a4543dd25b 100644
--- a/shell/GNOME_Evolution_Shell.server.in.in
+++ b/shell/GNOME_Evolution_Shell.server.in.in
@@ -2,7 +2,7 @@
 
   <oaf_server iid="OAFIID:GNOME_Evolution_Shell:@VERSION@"
 	      type="exe"
-	      location="@BINDIR@/evolution-@VERSION@">
+	      location="@BINDIR@/evolution-@VERSION@@EXEEXT@">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/Shell:@VERSION@"/>
diff --git a/shell/GNOME_Evolution_Test.server.in.in b/shell/GNOME_Evolution_Test.server.in.in
index cbd5187f62..24789ea089 100644
--- a/shell/GNOME_Evolution_Test.server.in.in
+++ b/shell/GNOME_Evolution_Test.server.in.in
@@ -3,7 +3,7 @@
   <!-- (factory) -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Test_Factory:@VERSION@"
 	      type="shlib"
-	      location="@COMPONENTDIR@/libevolution-test.so">
+	      location="@COMPONENTDIR@/libevolution-test@SOEXT@">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/ObjectFactory:1.0"/>