diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index da7671cd8..b3c16e69b 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-20  Peter A. Bigot  <pab@pabigot.com>
+
+	* libc/stdio/nano-vfprintf_i.c (_printf_i): Use LONGINT when void* is
+	larger than an int.
+
 2014-11-20  Sebastian Huber  <sebastian.huber@embedded-brains.de>
 
 	* libc/sys/rtems/sys/syslimits.h (NGROUPS_MAX): Adjust value so
diff --git a/newlib/libc/stdio/nano-vfprintf_i.c b/newlib/libc/stdio/nano-vfprintf_i.c
index b75a142da..46945b34a 100644
--- a/newlib/libc/stdio/nano-vfprintf_i.c
+++ b/newlib/libc/stdio/nano-vfprintf_i.c
@@ -150,8 +150,10 @@ _printf_i (struct _reent *data, struct _prt_data_t *pdata, FILE *fp,
        * defined manner.''
        *	-- ANSI X3J11
        */
-      /* NOSTRICT.  */
       pdata->flags |= HEXPREFIX;
+      if (sizeof (void*) > sizeof (int))
+	pdata->flags |= LONGINT;
+      /* NOSTRICT.  */
     case 'x':
       pdata->l_buf[2] = 'x';
       xdigs = "0123456789abcdef";