diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 2be47231f..cc8e7dccc 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-09  Corinna Vinschen  <vinschen@redhat.com>
+
+	* libc/stdio/vfwprintf.c (_VFWPRINTF_R): Fix guard around state to
+	allow usage in !FLOATING_POINT && _WANT_IO_C99_FORMATS case.
+
 2012-08-08  Eric Blake  <eblake@redhat.com>
 
 	* libc/posix/engine.c(dissect): Guard diagnostic pragma for right
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index 7d38ecf82..968c218b5 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -399,8 +399,8 @@ _DEFUN(_VFWPRINTF_R, (data, fp, fmt0, ap),
 	wchar_t thousands_sep = L'\0';
 	const char *grouping = NULL;
 #endif
-#if defined (FLOATING_POINT) && defined (_MB_CAPABLE) \
-    && !defined (__HAVE_LOCALE_INFO_EXTENDED__)
+#if defined (_MB_CAPABLE) && !defined (__HAVE_LOCALE_INFO_EXTENDED__) \
+    && (defined (FLOATING_POINT) || defined (_WANT_IO_C99_FORMATS))
 	mbstate_t state;        /* mbtowc calls from library must not change state */
 #endif
 #ifdef FLOATING_POINT