diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index d4b6c5756..4930593d2 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-14  Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* doc/makedoc.c: Use uintptr_t to avoid int/pointer size warnings
+
 2015-01-14  Stefan Wallentowitz  <stefan.wallentowitz@tum.de>
 
 	* configure.host: Add extra system for OpenRISC baremetal
diff --git a/newlib/doc/makedoc.c b/newlib/doc/makedoc.c
index 7d38a5db8..718864294 100644
--- a/newlib/doc/makedoc.c
+++ b/newlib/doc/makedoc.c
@@ -40,6 +40,7 @@ There is  no
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
+#include <stdint.h>
 
 #define DEF_SIZE 5000
 #define STACK 50
@@ -219,10 +220,10 @@ typedef void (*stinst_type)(NOARGS);
 stinst_type *pc;
 stinst_type sstack[STACK];
 stinst_type *ssp = &sstack[0];
-int istack[STACK];
-int *isp = &istack[0];
+uintptr_t istack[STACK];
+uintptr_t *isp = &istack[0];
 
-typedef int *word_type;
+typedef uintptr_t *word_type;
 
 
 
@@ -270,7 +271,7 @@ WORD(push_number)
 {
     isp++;
     pc++;
-    *isp = (int)(*pc);
+    *isp = (uintptr_t)(*pc);
     pc++;
     
 }
@@ -1338,7 +1339,7 @@ return(ret);
  
 static void DEFUN_VOID(bang)
 {
-*(int *)((isp[0])) = isp[-1];
+*(uintptr_t *)((isp[0])) = isp[-1];
 isp-=2;
 pc++;
 
@@ -1346,7 +1347,7 @@ pc++;
 
 WORD(atsign)
 {
-    isp[0] = *(int *)(isp[0]);
+    isp[0] = *(uintptr_t *)(isp[0]);
     pc++;
 }