diff --git a/plugins/exchange-account-setup/ChangeLog b/plugins/exchange-account-setup/ChangeLog
index ec4c9e4323..d8257fb947 100644
--- a/plugins/exchange-account-setup/ChangeLog
+++ b/plugins/exchange-account-setup/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-13  Sushma Rai  <rsushma@novell.com>
+
+	* org-gnome-exchange-account-setup.eplug.in: Combined
+	all the plugins into one. 
+
 2005-01-12  Sushma Rai  <rsushma@novell.com>
 
 	* exchange-ask-password.c: (validate_exchange_user):
diff --git a/plugins/exchange-account-setup/org-gnome-exchange-account-setup.eplug.in b/plugins/exchange-account-setup/org-gnome-exchange-account-setup.eplug.in
index d94bc323de..13deba4b56 100644
--- a/plugins/exchange-account-setup/org-gnome-exchange-account-setup.eplug.in
+++ b/plugins/exchange-account-setup/org-gnome-exchange-account-setup.eplug.in
@@ -18,15 +18,6 @@
 	      		factory="org_gnome_exchange_account_setup"/>
       	</group>
     </hook>
-  </e-plugin>
-
-   <e-plugin
-    type="shlib"
-    id="org.gnome.evolution.plugin.exchange-read-url"
-    location="@PLUGINDIR@/liborg-gnome-exchange-account-settings.so"
-    load-on-startup="true"
-    name="Exchange OWA URL"
-    description="A pluign to read OWA url in account druid">
 
     <hook class="org.gnome.evolution.mail.config:1.0">
         <group
@@ -40,15 +31,6 @@
 			factory="org_gnome_exchange_read_url"/>
         </group>
     </hook>
-  </e-plugin>
-
-   <e-plugin
-    type="shlib"
-    id="org.gnome.evolution.plugin.exchange-set-url"
-    location="@PLUGINDIR@/liborg-gnome-exchange-account-settings.so"
-    load-on-startup="true"
-    name="Exchange OWA URL in Account Editor"
-    description="A pluign to read OWA url in account editor">
 
     <hook class="org.gnome.evolution.mail.config:1.0">
         <group