diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8069d646e..6c28c6cde 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-13  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* include/stdint.h (intptr_t):  Remove long from type.
+	(uintptr_t):  Likewise.
+	(INTPTR_MIN):  Remove 'L' suffix.
+	(INTPTR_MAX, UINTPTR_MAX):  Likewise.
+
 2009-04-12  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* speclib: Initial stab at cleaning up temp files.  More work needed.
diff --git a/winsup/cygwin/include/stdint.h b/winsup/cygwin/include/stdint.h
index 47c591498..12f16e220 100644
--- a/winsup/cygwin/include/stdint.h
+++ b/winsup/cygwin/include/stdint.h
@@ -57,9 +57,9 @@ typedef unsigned long long uint_fast64_t;
 
 #ifndef __intptr_t_defined
 #define __intptr_t_defined
-typedef long intptr_t;
+typedef int intptr_t;
 #endif
-typedef unsigned long uintptr_t;
+typedef unsigned int uintptr_t;
 
 /* Greatest-width integer types */
 
@@ -119,9 +119,9 @@ typedef unsigned long long uintmax_t;
 
 /* Limits of integer types capable of holding object pointers */
 
-#define INTPTR_MIN (-2147483647L - 1L)
-#define INTPTR_MAX (2147483647L)
-#define UINTPTR_MAX (4294967295UL)
+#define INTPTR_MIN (-2147483647 - 1)
+#define INTPTR_MAX (2147483647)
+#define UINTPTR_MAX (4294967295U)
 
 /* Limits of greatest-width integer types */