diff --git a/include/ChangeLog b/include/ChangeLog
index 5a541b610bcc..95a00be6eef4 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-05  John David Anglin <dave@hiauly1.hia.nrc.ca>
+
+	* md5.h (md5_uint32): Choose via INT_MAX instead of UINT_MAX.
+
 2000-09-04  Alex Samuel  <samuel@codesourcery.com>
 
 	* dyn-string.h: Adjust formatting. 
diff --git a/include/md5.h b/include/md5.h
index ad97efc32135..0840b31b4587 100644
--- a/include/md5.h
+++ b/include/md5.h
@@ -38,28 +38,24 @@
 # include <sys/types.h>
 typedef u_int32_t md5_uint32;
 #else
-# if defined __STDC__ && __STDC__
-#  define UINT_MAX_32_BITS 4294967295U
-# else
-#  define UINT_MAX_32_BITS 0xFFFFFFFF
-# endif
+#  define INT_MAX_32_BITS 2147483647
 
 /* If UINT_MAX isn't defined, assume it's a 32-bit type.
    This should be valid for all systems GNU cares about because
    that doesn't include 16-bit systems, and only modern systems
    (that certainly have <limits.h>) have 64+-bit integral types.  */
 
-# ifndef UINT_MAX
-#  define UINT_MAX UINT_MAX_32_BITS
+# ifndef INT_MAX
+#  define INT_MAX INT_MAX_32_BITS
 # endif
 
-# if UINT_MAX == UINT_MAX_32_BITS
+# if INT_MAX == INT_MAX_32_BITS
    typedef unsigned int md5_uint32;
 # else
-#  if USHRT_MAX == UINT_MAX_32_BITS
+#  if SHRT_MAX == INT_MAX_32_BITS
     typedef unsigned short md5_uint32;
 #  else
-#   if ULONG_MAX == UINT_MAX_32_BITS
+#   if LONG_MAX == INT_MAX_32_BITS
      typedef unsigned long md5_uint32;
 #   else
      /* The following line is intended to evoke an error.