diff --git a/ChangeLog b/ChangeLog
index 483d43a29..eefee34d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-20  Bradford Hovinen  <hovinen@ximian.com>
+
+	* capplets/new-*/main.c (do_set_xml): Don't save unless
+	apply_settings is set
+
 2001-06-20  Richard Hestilow  <hestilow@ximian.com>
 
 	* capplets/new-background-properties/applicer.c
@@ -17,6 +22,12 @@
 	fread () to make sure to catch end-of-file. Gracefully handle
 	no-data case.
 
+2001-06-12  Bradford Hovinen  <hovinen@ximian.com>
+
+	* capplets/new-mouse-properties/main.c (ok_cb):
+	(cancel_cb): Add #ifdef HAVE_XIMIAN_ARCHIVER around some parts
+	missing it
+
 2001-06-07  Christian Rose  <menthos@menthos.com>
 
 	* capplets/desktop-links/Appearances.directory,
diff --git a/capplets/background/main.c b/capplets/background/main.c
index 028113ac0..4d17660f5 100644
--- a/capplets/background/main.c
+++ b/capplets/background/main.c
@@ -175,10 +175,10 @@ do_set_xml (gboolean apply_settings)
 			prefs = preferences_read_xml (doc);
 
 			if (prefs != NULL) {
-				preferences_save (prefs);
-
-				if (apply_settings)
+				if (apply_settings) {
+					preferences_save (prefs);
 					preferences_apply_now (prefs);
+				}
 
 				return;
 			}
diff --git a/capplets/keyboard/main.c b/capplets/keyboard/main.c
index a486b7e34..48f011eba 100644
--- a/capplets/keyboard/main.c
+++ b/capplets/keyboard/main.c
@@ -164,10 +164,10 @@ do_set_xml (gboolean apply_settings)
 			prefs = preferences_read_xml (doc);
 
 			if (prefs != NULL) {
-				preferences_save (prefs);
-
-				if (apply_settings)
+				if (apply_settings) {
+					preferences_save (prefs);
 					preferences_apply_now (prefs);
+				}
 
 				return;
 			}