diff --git a/ChangeLog b/ChangeLog
index f146edba8..ca2e17fe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkfont.c: Replace stpcpy with grub_stpcpy.
+
 2013-12-07  Andrey Borzenkov <arvidjaar@gmail.com>
 
 	* docs/grub.texi (Environment): Update color_normal and color_highlight
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 242dd01ee..d3a8af05c 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -821,9 +821,9 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
 
   font_name = xmalloc (strlen (font_info->name) + strlen (&style_name[1])
 		       + 3 + 20);
-  ptr = stpcpy (font_name, font_info->name);
+  ptr = grub_stpcpy (font_name, font_info->name);
   *ptr++ = ' ';
-  ptr = stpcpy (ptr, &style_name[1]);
+  ptr = grub_stpcpy (ptr, &style_name[1]);
   *ptr++ = ' ';
   snprintf (ptr, 20, "%d", font_info->size);