diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c5159ef37..7225d1520 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-29  Eric Blake  <ebb9@byu.net>
+
+	* include/limits.h (LLONG_MIN, LLONG_MAX, ULLONG_MAX): Always define.
+
 2005-05-28  Christopher Faylor  <cgf@timesys.com>
 
 	* thread.h (pthread_key::set): Inline.
diff --git a/winsup/cygwin/include/limits.h b/winsup/cygwin/include/limits.h
index f74297654..01e6db7b7 100644
--- a/winsup/cygwin/include/limits.h
+++ b/winsup/cygwin/include/limits.h
@@ -107,7 +107,6 @@ details. */
 #define ULONG_LONG_MAX (LONG_LONG_MAX * 2ULL + 1)
 #endif
 
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 /* Minimum and maximum values a `signed long long int' can hold.  */
 #undef LLONG_MIN
 #define LLONG_MIN (-LLONG_MAX-1)
@@ -117,7 +116,6 @@ details. */
 /* Maximum value an `unsigned long long int' can hold.  (Minimum is 0).  */
 #undef ULLONG_MAX
 #define ULLONG_MAX (LLONG_MAX * 2ULL + 1)
-#endif
 
 /* Maximum number of iovcnt in a writev (an arbitrary number) */
 #undef IOV_MAX