diff --git a/ChangeLog b/ChangeLog
index 1de66306a..43021fbfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gunicode.h (g_utf8_next_char): Cast to const char *,
+	not char *.  (#138153, Nikolai Weibull)
+
 2006-11-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* m4macros/glib-gettext.m4: Apply a patch from James
diff --git a/glib/gunicode.h b/glib/gunicode.h
index a358dc1fa..144858397 100644
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -173,7 +173,7 @@ gunichar *g_unicode_canonical_decomposition (gunichar  ch,
  */
 GLIB_VAR const gchar * const g_utf8_skip;
 
-#define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(guchar *)(p)])
+#define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(const guchar *)(p)])
 
 gunichar g_utf8_get_char           (const gchar  *p);
 gunichar g_utf8_get_char_validated (const  gchar *p,