diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index e7a85348e..22419a24f 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-08  Glynn Foster  <glynn.foster@sun.com>
+
+	* GNOME_SettingsDaemon.server.in: Remove from CVS since it's
+	a generated file.
+
 2003-12-30  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.1.1
diff --git a/gnome-settings-daemon/GNOME_SettingsDaemon.server.in b/gnome-settings-daemon/GNOME_SettingsDaemon.server.in
deleted file mode 100644
index c5db775bd..000000000
--- a/gnome-settings-daemon/GNOME_SettingsDaemon.server.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<oaf_info>
-  <oaf_server iid="OAFIID:GNOME_SettingsDaemon"
-	      type="exe" location="/local/gnome-head/test/libexec/gnome-settings-daemon">
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:Bonobo/Unknown:1.0"/>
-      <item value="IDL:GNOME/SettingsDaemon:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-</oaf_info>