diff --git a/ChangeLog b/ChangeLog
index 97f8f9a3dd..5b7ed5d8b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconcache.c (icon_name_hash): Use the same function 
+	as in updateiconcache.c.  (spotted by Morten Welinder)
+
 2005-04-08  Carl Worth  <cworth@cworth.org>
 
 	* gdk/gdkpango.c: (emboss_context): Simplify matrix manipulation
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 97f8f9a3dd..5b7ed5d8b2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-04-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconcache.c (icon_name_hash): Use the same function 
+	as in updateiconcache.c.  (spotted by Morten Welinder)
+
 2005-04-08  Carl Worth  <cworth@cworth.org>
 
 	* gdk/gdkpango.c: (emboss_context): Simplify matrix manipulation
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 97f8f9a3dd..5b7ed5d8b2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-04-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconcache.c (icon_name_hash): Use the same function 
+	as in updateiconcache.c.  (spotted by Morten Welinder)
+
 2005-04-08  Carl Worth  <cworth@cworth.org>
 
 	* gdk/gdkpango.c: (emboss_context): Simplify matrix manipulation
diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index 20166d8a64..d52251c5a3 100644
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -223,8 +223,8 @@ _gtk_icon_cache_has_directory (GtkIconCache *cache,
 static guint
 icon_name_hash (gconstpointer key)
 {
-  const char *p = key;
-  guint h = *p;
+  const signed char *p = key;
+  guint32 h = *p;
 
   if (h)
     for (p += 1; *p != '\0'; p++)