diff --git a/ChangeLog b/ChangeLog
index 3c4b726d..1c1455b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-11  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* ltmain.in: FreeBSD bug that needs symbol table compiled with
+	-fPIC is fixed in release 3.1; use it only for 2.* and 3.0
+
 1999-03-11  Thomas Tanner  <tanner@gmx.de>
 
 	* ltmain.in: when building a library it doesn't make 
diff --git a/ltmain.in b/ltmain.in
index 98a061a3..3a493274 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -2446,11 +2446,12 @@ static const void *lt_preloaded_setup() {
 
 	  pic_flag_for_symtable=
           case "$host" in
-	  # compiling the symbol table file with pic_flag works around a 
-	  # FreeBSD bug that causes programs to crash when -lm is linked
-	  # before any other PIC object.  But we must not use pic_flag
-	  # when linking with -static.
-	  *-*-freebsd*)
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*)
 	    case "$compile_command " in
 	    *" -static "*) ;;
 	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;