diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0067aba18b4..2bd6f208cd1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-24  Loren J. Rittle  <ljrittle@acm.org>
+
+	* config/cpu/i386/bits/limits.h (__glibcpp_long_double_bits): Only
+	define if not already provided by per-OS file.
+	* config/os/bsd/freebsd/bits/os_defines.h (__glibcpp_long_double_bits):
+	Define.
+
 2001-08-24  Jan van Male <jan.vanmale@fenk.wau.nl>
 
 	* docs/html/17_intro/C++STYLE:  Fix typo.
diff --git a/libstdc++-v3/config/cpu/i386/bits/limits.h b/libstdc++-v3/config/cpu/i386/bits/limits.h
index be304e2d805..31b6eab5d22 100644
--- a/libstdc++-v3/config/cpu/i386/bits/limits.h
+++ b/libstdc++-v3/config/cpu/i386/bits/limits.h
@@ -28,6 +28,9 @@
 #ifndef _GLIBCPP_CPU_LIMITS
 #define _GLIBCPP_CPU_LIMITS 1
 
+// Some operating systems set this
+#ifndef __glibcpp_long_double_bits
 #define __glibcpp_long_double_bits 80
+#endif
 
 #endif
diff --git a/libstdc++-v3/config/os/bsd/freebsd/bits/os_defines.h b/libstdc++-v3/config/os/bsd/freebsd/bits/os_defines.h
index 3a6803f8f3d..3c31f3a1051 100644
--- a/libstdc++-v3/config/os/bsd/freebsd/bits/os_defines.h
+++ b/libstdc++-v3/config/os/bsd/freebsd/bits/os_defines.h
@@ -35,6 +35,8 @@
 /* System-specific #define, typedefs, corrections, etc, go here.  This
    file will come before all others. */
 
+#define __glibcpp_long_double_bits __glibcpp_double_bits
+
 #define _GLIBCPP_AVOID_FSEEK 1
 
 #endif