diff --git a/ChangeLog b/ChangeLog
index 421b86b9955..85ed2cae8b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-22  Loren J. Rittle  <ljrittle@acm.org>
+
+        * ltcf-cxx.sh: Support creation of C++ shared libraries on
+        recent versions of FreeBSD (release 3 or later).
+        * ltconfig: On FreeBSD, -lc must not be provided when building
+        a shared library or else the standard -pthread gcc option is
+        rendered worthless to later users of the built library.
+
 2000-11-16  Fred Fish  <fnf@be.com>
 
 	* configure.in (enable_libstdcxx_v3): Fix typo,
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index cefa0085624..fbcf248faa7 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -167,11 +167,15 @@ case "$host_os" in
         ;;
     esac
     ;;
-  freebsd*)
-    # FreeBSD uses GNU C++ and GNU ld
-    # FIXME: insert proper C++ library support
+  freebsd[12]*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
     ld_shlibs=no
     ;;
+  freebsd*)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    ld_shlibs=yes
+    ;;
   hpux*)
     case "$cc_basename" in
       CC)
diff --git a/ltconfig b/ltconfig
index a79434264e4..25d1c647915 100755
--- a/ltconfig
+++ b/ltconfig
@@ -1012,6 +1012,7 @@ freebsd*)
     freebsd-elf*)
       library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
       need_version=no
+      need_lc=no
       need_lib_prefix=no
       ;;
     freebsd-*)