diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f39011ea780..c67b33774be 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-31  Loren J. Rittle  <ljrittle@acm.org>
+
+        * src/gen-num-limits.cc:  Use __LONG_LONG_MAX__.
+
 2001-07-30  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* configure.target: Remove mips from cpu table.
diff --git a/libstdc++-v3/src/gen-num-limits.cc b/libstdc++-v3/src/gen-num-limits.cc
index d5e37b7ecc4..14f6afe05f4 100644
--- a/libstdc++-v3/src/gen-num-limits.cc
+++ b/libstdc++-v3/src/gen-num-limits.cc
@@ -373,8 +373,8 @@ DEFINE_EXTREMA(unsigned int, 0, UINT_MAX);
 DEFINE_EXTREMA(long, LONG_MIN, LONG_MAX);
 DEFINE_EXTREMA(unsigned long, 0, ULONG_MAX);
 #ifdef _GLIBCPP_USE_LONG_LONG
-DEFINE_EXTREMA(long long, LONG_LONG_MIN, LONG_LONG_MAX);
-DEFINE_EXTREMA(unsigned long long, 0, ULONG_LONG_MAX);
+DEFINE_EXTREMA(long long, (-__LONG_LONG_MAX__-1), __LONG_LONG_MAX__);
+DEFINE_EXTREMA(unsigned long long, 0, (__LONG_LONG_MAX__ * 2ULL + 1));
 #endif
 DEFINE_EXTREMA(float, FLT_MIN, FLT_MAX);
 DEFINE_EXTREMA(double, DBL_MIN, DBL_MAX);