diff --git a/ChangeLog b/ChangeLog
index f12214d527..7d8343fcd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-09  Andreas Schwab  <schwab@suse.de>
 
+	* stdio-common/vfprintf.c (vfprintf): Also set `is_long' if the
+	long long modifier is seen.
+
 	* elf/nodelete.c (do_test): Remove reference to undefined member
 	sa_restorer.
 	* rt/tst-aio4.c (do_test): Likewise.
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index c67af60988..216ab291fa 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -1471,6 +1471,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	 allowed to follow.  */
     LABEL (mod_longlong):
       is_long_double = 1;
+      is_long = 1;
       JUMP (*++f, step4_jumps);
 
     LABEL (mod_size_t):