diff --git a/ChangeLog b/ChangeLog
index f03970875..7b7101728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-26  jacob berkman  <jacob@ximian.com>
+
+	* schemas/Makefile.am (schema_DATA): add new .schemas file
+
+	* schemas/apps_gnome_settings_daemon_screensaver.schemas: settings
+	for starting screensaver
+
 Mon Mar 25 00:51:06 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* configure.in (RELEASE): 1.99.5
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index ff89e5909..7220d22de 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,6 +1,7 @@
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_DATA = \
-	apps_gnome_keybinding_properties.schemas
+	apps_gnome_keybinding_properties.schemas	\
+	apps_gnome_settings_daemon_screensaver.schemas
 
 schema_source_data = $(foreach file, $(schema_DATA), $(srcdir)/$(file))
 
diff --git a/schemas/apps_gnome_settings_daemon_screensaver.schemas b/schemas/apps_gnome_settings_daemon_screensaver.schemas
new file mode 100644
index 000000000..1d60531fb
--- /dev/null
+++ b/schemas/apps_gnome_settings_daemon_screensaver.schemas
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+    <schemalist>
+	<schema>
+	    <key>/schemas/apps/gnome_settings_daemon/screensaver/start_screensaver</key>
+	    <applyto>/apps/gnome_settings_daemon/screensaver/start_screensaver</applyto>
+            <owner>gnome</owner>
+	    <type>bool</type>
+            <default>true</default>
+            <locale name="C">
+	        <short>Start XScreenSaver</short>
+                <long>Run XScreenSaver at login</long>
+            </locale>
+        </schema>
+	<schema>
+	    <key>/schemas/apps/gnome_settings_daemon/screensaver/show_startup_errors</key>
+	    <applyto>/apps/gnome_settings_daemon/screensaver/show_startup_errors</applyto>
+ 	    <owner>gnome</owner>
+	    <type>bool</type>
+	    <default>true</default>
+            <locale name="C">
+                <short>Show Startup Errors</short>
+	        <long>Display a dialog when there are errors running XScreenSaver</long>
+	    </locale>
+	</schema>
+    </schemalist>
+</gconfschemafile>