diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 95a43c7e4..c81f47d46 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* libc/include/stdint.h (UINTPTR_MAX): Define to __UINTPTR_MAX__
+	if __UINTPTR_MAX__ defined.
+
 2009-04-24  Eric Blake  <ebb9@byu.net>
 
 	Be namespace clean in ctype.h.
diff --git a/newlib/libc/include/stdint.h b/newlib/libc/include/stdint.h
index 2791cd544..94759e969 100644
--- a/newlib/libc/include/stdint.h
+++ b/newlib/libc/include/stdint.h
@@ -244,7 +244,11 @@ typedef signed __PTRDIFF_TYPE__ intptr_t;
 typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
 #define INTPTR_MAX PTRDIFF_MAX
 #define INTPTR_MIN PTRDIFF_MIN
+#ifdef __UINTPTR_MAX__
+#define UINTPTR_MAX __UINTPTR_MAX__
+#else
 #define UINTPTR_MAX (2UL * PTRDIFF_MAX + 1)
+#endif
 #else
 /*
  * Fallback to hardcoded values,