diff --git a/ChangeLog b/ChangeLog
index 8247941d2..2c8cd8efc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-02  Matt Kraai  <kraai@ftbfs.org>
+
+	* src/core/iconcache.c: patches to fixes for -Wall.  Closes #562939.
+
 2008-12-01  Thomas Thurman  <tthurman@gnome.org>
 
         * configure.in: Post-release bump to 2.25.34.
diff --git a/src/core/iconcache.c b/src/core/iconcache.c
index 084eeee0d..7fa218408 100644
--- a/src/core/iconcache.c
+++ b/src/core/iconcache.c
@@ -230,7 +230,7 @@ read_rgb_icon (MetaDisplay   *display,
   int w, h;
   gulong *best_mini;
   int mini_w, mini_h;
-  gulong *data_as_long = (gulong*) data;
+  gulong *data_as_long;
 
   meta_error_trap_push_with_return (display);
   type = None;
@@ -253,6 +253,8 @@ read_rgb_icon (MetaDisplay   *display,
       return FALSE;
     }
 
+  data_as_long = (gulong *)data;
+
   if (!find_best_size (data_as_long, nitems,
                        ideal_width, ideal_height,
                        &w, &h, &best))
@@ -465,7 +467,7 @@ get_kwm_win_icon (MetaDisplay *display,
   gulong nitems;
   gulong bytes_after;
   guchar *data;
-  Pixmap *icons = (Pixmap*) icons;
+  Pixmap *icons;
   int err, result;
 
   *pixmap = None;
@@ -480,6 +482,7 @@ get_kwm_win_icon (MetaDisplay *display,
                                display->atom__KWM_WIN_ICON,
 			       &type, &format, &nitems,
 			       &bytes_after, &data);
+  icons = (Pixmap *)data;
 
   err = meta_error_trap_pop_with_return (display, TRUE);
   if (err != Success ||