diff --git a/ChangeLog b/ChangeLog
index b73b02e087..56c7863d31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/updateiconcache.c: Fix the previous commit to compile.
+
 2008-02-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/updateiconcache.c: Install a printerr handler that
diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index fee8fa6975..84fd0e007c 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -1586,10 +1586,16 @@ printerr_handler (const gchar *string)
     fputs (string, stderr); /* charset is UTF-8 already */
   else
     {
-      gchar *lstring = strdup_convert (string, charset);
-      fputs (lstring, stderr);
-      g_free (lstring);
-        
+      gchar *result;
+
+      result = g_convert_with_fallback (string, -1, charset, "UTF-8", "?", NULL, NULL, NULL);
+      
+      if (result)
+        {
+          fputs (result, stderr);
+          g_free (result);
+        }
+   
       fflush (stderr);
     }
 }