diff --git a/ChangeLog b/ChangeLog
index 690ce86c0..35725ef4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/term.h (grub_unicode_estimate_width): Use grub_size_t
+	as return type in both conditionals.
+
 2013-12-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/video.h (grub_video_rgba_color_rgb): Fix prototype
diff --git a/include/grub/term.h b/include/grub/term.h
index 528c53008..98c68a5ab 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -405,7 +405,7 @@ grub_unicode_estimate_width (const struct grub_unicode_glyph *c);
 
 #else
 
-static inline grub_ssize_t
+static inline grub_size_t
 grub_unicode_estimate_width (const struct grub_unicode_glyph *c __attribute__ ((unused)))
 {
   if (grub_unicode_get_comb_type (c->base))