diff --git a/include/ChangeLog b/include/ChangeLog
index 4263ab41..88659339 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-17  Marcel Telka  <marcel@telka.sk>
+
+	* stdint.h: Ported to cygwin-1.3.21. uint8_t, uint16_t, uint32_t, uint64_t,
+		and uintptr_t are now declared in cygwin/types.h.
+
 2003-02-12  Marcel Telka  <marcel@telka.sk>
 
 	Version 0.2.1 released.
diff --git a/include/NEWS b/include/NEWS
index 8d17279c..12d93c20 100644
--- a/include/NEWS
+++ b/include/NEWS
@@ -1,5 +1,7 @@
 $Id$
 
+	* stdint.h ported to cygwin-1.3.21.
+
 include-0.2.1 (2003-02-12):
 
 	* Changes in PXA2x0 support:
diff --git a/include/stdint.h b/include/stdint.h
index 802ac5c9..1568b06e 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -36,13 +36,13 @@ typedef int  int32_t;
 typedef long long  int64_t;
 #endif /* !defined(UNDER_CE) */
 #endif /* __int8_t_defined */
-#endif /* defined(__CYGWIN__) */
 typedef unsigned char   uint8_t;
 typedef unsigned short  uint16_t;
 typedef unsigned   uint32_t;
 #if !defined(UNDER_CE)
 typedef unsigned long long   uint64_t;
 #endif /* !defined(UNDER_CE) */
+#endif /* defined(__CYGWIN__) */
 
 /* 7.18.1.2  Minimum-width integer types */
 typedef signed char int_least8_t;
@@ -76,7 +76,9 @@ typedef unsigned long long   uint_fast64_t;
 typedef int intptr_t;
 #define	__intptr_t_defined
 #endif /* __intptr_t_defined */
+#ifndef __uintptr_t_defined
 typedef unsigned uintptr_t;
+#endif /* __uintptr_t_defined */
 
 /* 7.18.1.5  Greatest-width integer types */
 #if !defined(UNDER_CE)