diff --git a/ChangeLog b/ChangeLog
index 6cf9897d1..df2e7295e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
    which don't have ECC support in libcrypto.
  - (dtucker) [regress/cert-userkey.sh] Disable ECC-based tests on platforms
    which don't have ECC support in libcrypto.
+ - (dtucker) [defines.h] Add SIZE_MAX for the benefit of platforms that don't
+   have it.
  - (dtucker) OpenBSD CVS Sync
    - sthen@cvs.openbsd.org 2010/10/23 22:06:12
      [sftp.c]
diff --git a/defines.h b/defines.h
index fe25170e6..49c901aff 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.160 2010/04/09 08:13:27 dtucker Exp $ */
+/* $Id: defines.h,v 1.161 2010/10/24 00:58:44 dtucker Exp $ */
 
 
 /* Constants */
@@ -250,6 +250,10 @@ typedef unsigned char u_char;
 #define SIZE_T_MAX ULONG_MAX
 #endif /* SIZE_T_MAX */
 
+#ifndef SIZE_MAX
+#define SIZE_MAX UINT_MAX
+#endif
+
 #ifndef HAVE_SIZE_T
 typedef unsigned int size_t;
 # define HAVE_SIZE_T