diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 5855900a5..3cdf1e07c 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-16  Hans-Peter Nilsson  <hp@axis.com>
+
+	* libc/include/stdint.h (INTPTR_MIN, INTPTR_MAX, UINTPTR_MAX): Define.
+
 2009-04-16  Ken Werner  <ken.werner@de.ibm.com>
 
 	* libm/libm.texinfo: Add long double function support chapter.
@@ -270,8 +274,8 @@
 	* libm/common/Makefile.am: Add s_llround.c (src); sf_llround.c (fsrc); 
 	s_fdim.def, s_fma.def, s_fmax.def, s_fmin.def,
 	s_logb.def, s_lrint.def, s_lround.def, s_nearbyint.def, s_remquo.def,
-        s_rint.def, s_round.def, s_signbit.def, s_trunc.def, and
-        isgreater.def (chobj);
+	s_rint.def, s_round.def, s_signbit.def, s_trunc.def, and
+	isgreater.def (chobj);
 	re-name all existing chew files (chobj) to match source file base
 	names (put in underscores), delete all special targets for chew files
 	(leaving all to be generated by rule).
diff --git a/newlib/libc/include/stdint.h b/newlib/libc/include/stdint.h
index d47b22261..2791cd544 100644
--- a/newlib/libc/include/stdint.h
+++ b/newlib/libc/include/stdint.h
@@ -242,6 +242,9 @@ typedef uint64_t  	uint_least32_t;
 #if defined(__PTRDIFF_TYPE__)
 typedef signed __PTRDIFF_TYPE__ intptr_t;
 typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
+#define INTPTR_MAX PTRDIFF_MAX
+#define INTPTR_MIN PTRDIFF_MIN
+#define UINTPTR_MAX (2UL * PTRDIFF_MAX + 1)
 #else
 /*
  * Fallback to hardcoded values, 
@@ -249,6 +252,9 @@ typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
  */
 typedef signed long intptr_t;
 typedef unsigned long uintptr_t;
+#define INTPTR_MAX __STDINT_EXP(LONG_MAX)
+#define INTPTR_MIN (-__STDINT_EXP(LONG_MAX) - 1)
+#define UINTPTR_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1)
 #endif
 
 /* Limits of Specified-Width Integer Types */