diff --git a/ChangeLog b/ChangeLog
index 15a9987b4..f74e63284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,11 +3,6 @@
 	* gnome-settings-daemon/Makefile.am: commented lines ending in a
 	trailing backslash are not a good idea.
 
-2002-06-21  Satyajit Kanungo  <satyajit.kanungo@wipro.com>
-
-	* capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c :
- 	 Changed the help link to point to the correct document (#85895)
-
 2002-06-18  jacob berkman  <jacob@ximian.com>
 
 	* configure.in:
diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog
index a46bff9f2..6fbbf73d5 100644
--- a/capplets/accessibility/keyboard/ChangeLog
+++ b/capplets/accessibility/keyboard/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-21  Satyajit Kanungo  <satyajit.kanungo@wipro.com>
+
+	* gnome-accessibility-keyboard-properties.c :
+ 	 Changed the help link to point to the correct document (#85895)
+
 2002-06-10  Jody Goldberg <jody@gnome.org>
 
 	* accessibility-keyboard.c : tweak the layout as requested and adjust
diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
index d9b150a0b..4b07b49a8 100644
--- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
+++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
@@ -37,14 +37,12 @@ dialog_response (GtkWidget *widget,
 		 gint       response_id,
 		 GConfChangeSet *changeset)
 {
-	if (response_id == GTK_RESPONSE_HELP) {
+	if (response_id == GTK_RESPONSE_HELP)
 		capplet_help (GTK_WINDOW (widget),
 			      "wgoscustaccess.xml",
 			      "goscustaccess-2");
-	}
-	else {
+	else
 		gtk_main_quit ();
-	}
 }
 
 int
diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog
index da7ac22ba..97abf0cd1 100644
--- a/libbackground/ChangeLog
+++ b/libbackground/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-18  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=85224
+	* applier.c (render_wallpaper) : clamp to avoid underflow
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0
diff --git a/libbackground/applier.c b/libbackground/applier.c
index 4258e7351..cd95f5148 100644
--- a/libbackground/applier.c
+++ b/libbackground/applier.c
@@ -695,10 +695,15 @@ render_wallpaper (BGApplier *bg_applier, const BGPreferences *prefs)
 
 		if (prefs->wallpaper_type == WPTYPE_TILED) {
 			if (dest_geom.width != pwidth || dest_geom.height != pheight) {
+				int hscale = pwidth * bg_applier->p->render_geom.width / virtual_geom.width;
+				int vscale = pheight * bg_applier->p->render_geom.height / virtual_geom.height;
+
+				if (hscale < 1) hscale = 1;
+				if (vscale < 1) vscale = 1;
+
+				pheight * bg_applier->p->render_geom.height / virtual_geom.height,
 				prescaled_pixbuf = gdk_pixbuf_scale_simple
-					(bg_applier->p->wallpaper_pixbuf,
-					 pwidth * bg_applier->p->render_geom.width / virtual_geom.width,
-					 pheight * bg_applier->p->render_geom.height / virtual_geom.height,
+					(bg_applier->p->wallpaper_pixbuf, hscale, vscale,
 					 GDK_INTERP_BILINEAR);
 			} else {
 				prescaled_pixbuf = bg_applier->p->wallpaper_pixbuf;