diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index bfc0f91f8..aa5cf790c 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-13  Rodney Dawes  <dobey@novell.com>
+
+	* gnome-wp-info.c (gnome_wp_info_new): Pass the md5sum to the call
+	to g_strconcat to create the path to the thumbnail file
+
+	Fixes #310293
+
 2005-07-10  Rodney Dawes  <dobey@novell.com>
 
 	* gnome-wp-capplet.[ch]:
diff --git a/capplets/background/gnome-wp-info.c b/capplets/background/gnome-wp-info.c
index edf9f39dc..6473a7a8a 100644
--- a/capplets/background/gnome-wp-info.c
+++ b/capplets/background/gnome-wp-info.c
@@ -69,11 +69,17 @@ GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
 						    escaped_path,
 						    info->mtime);
     if (new->thumburi == NULL) {
+      gchar * md5sum;
+
+      md5sum = gnome_thumbnail_md5 (escaped_path);
+
       new->thumburi = g_strconcat (g_get_home_dir (),
 				   "/.thumbnails/normal/",
-				   escaped_path,
+				   md5sum,
 				   ".png",
 				   NULL);
+
+      g_free (md5sum);
     }
     new->name = g_strdup (info->name);
     new->mime_type = g_strdup (info->mime_type);