diff --git a/ChangeLog b/ChangeLog
index ae98382fa..c2239c5ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/misc.c (asprintf): Use vsnprintf instead of
+	vsprintf.
+
 2010-09-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/commands/efi/lsefimmap.c: Correct header.
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index 4630d335d..d8db3be9d 100644
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -161,7 +161,7 @@ vasprintf (char **buf, const char *fmt, va_list ap)
   /* Should be large enough.  */
   *buf = xmalloc (512);
 
-  return vsprintf (*buf, fmt, ap);
+  return vsnprintf (*buf, 512, fmt, ap);
 }
 
 #endif