diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fb58e6ccc..6cca20af2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-17  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* include/stdint.h: Use int rather than long for {u,}int32_t.
+
 2008-05-16  Corinna Vinschen  <corinna@vinschen.de>
 
 	* CYGWIN_LICENSE: Remove duplicate file here.
diff --git a/winsup/cygwin/include/stdint.h b/winsup/cygwin/include/stdint.h
index 141158123..9d45015f0 100644
--- a/winsup/cygwin/include/stdint.h
+++ b/winsup/cygwin/include/stdint.h
@@ -17,7 +17,7 @@ details. */
 #define __int8_t_defined
 typedef signed char int8_t;
 typedef short int16_t;
-typedef long int32_t;
+typedef int int32_t;
 typedef long long int64_t;
 #endif
 
@@ -25,7 +25,7 @@ typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 #ifndef __uint32_t_defined
 #define __uint32_t_defined
-typedef unsigned long uint32_t;
+typedef unsigned int uint32_t;
 #endif
 typedef unsigned long long uint64_t;