diff --git a/ChangeLog b/ChangeLog
index 2b1322427..5e68eb0d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-15  Robert Millan  <rmh@aybabtu.com>
+
+	* kern/misc.c (grub_vsprintf): Do not reset `longlongfmt' to zero
+	when pointers are 32-bit (but still do set it to one when they are
+	64-bit).
+
 2008-01-15  Robert Millan  <rmh@aybabtu.com>
 
 	* include/grub/ieee1275/ieee1275.h
diff --git a/kern/misc.c b/kern/misc.c
index 9ac88f63d..e6d5c057f 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -768,7 +768,7 @@ grub_vsprintf (char *str, const char *fmt, va_list args)
 	    case 'p':
 	      write_str ("0x");
 	      c = 'x';
-	      longlongfmt = (sizeof (void *) == sizeof (long long));
+	      longlongfmt |= (sizeof (void *) == sizeof (long long));
 	      /* fall through */
 	    case 'x':
 	    case 'u':