diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index f837ddabe..e39d7db3a 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * libc/include/sys/config.h: Add definitions for
+        __int16_t, __uint16_t, __int64_t, and __uint64_t.
+
 2002-02-12  Hans-Peter Nilsson  <hp@bitrange.com>
 
         * libc/sys/mmixware/link.c: New.
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
index a19274591..dcde26aee 100644
--- a/newlib/libc/include/sys/config.h
+++ b/newlib/libc/include/sys/config.h
@@ -126,6 +126,9 @@
 #define _REENT_SMALL
 #endif
 
+typedef short int __int16_t;
+typedef unsigned short int __uint16_t;
+
 #if INT_MAX == 32767
 typedef long int __int32_t;
 typedef unsigned long int __uint32_t;
@@ -134,6 +137,14 @@ typedef int __int32_t;
 typedef unsigned int __uint32_t;
 #endif
 
+#if LONG_MAX > 2147483647 || !defined(__GNUC__)
+typedef long int __int64_t;
+typedef unsigned long int __uint64_t;
+#else
+typedef long long __int64_t;
+typedef unsigned long long __uint64_t;
+#endif
+
 #ifndef _POINTER_INT
 #define _POINTER_INT long
 #endif