diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 983682fcf86..f8350e6333e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-04  Loren J. Rittle  <ljrittle@acm.org>
+
+	* configure.ac (*-*-freebsd[[1234]]*): Refine error message
+	emission rule.
+	* configure: Rebuilt.
+
 2004-09-30  Tom Tromey  <tromey@redhat.com>
 
 	* java/text/MessageFormat.java (Field): Constructor now
diff --git a/libjava/configure b/libjava/configure
index e0a8bfd6328..050c5281a71 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -8332,7 +8332,7 @@ case "$THREADS" in
 	# the command line.  For now, the user must provide the -pthread
 	# switch to link code compiled with gcj.  In future, consider adding
 	# support for weak references to pthread_* functions ala gthr.h API.
-	THREADSPEC='%{!pthread: %eUnder this configuration, the user must provide -pthread when linking.}'
+	THREADSPEC='%{!pthread: %{!shared: %eUnder this configuration, the user must provide -pthread when linking.}}'
 	;;
      *-*-freebsd*)
 	# FreeBSD 5 implements a model much closer to other modern UNIX
diff --git a/libjava/configure.ac b/libjava/configure.ac
index fdc38d573f9..c0282afda5b 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -652,7 +652,7 @@ case "$THREADS" in
 	# the command line.  For now, the user must provide the -pthread
 	# switch to link code compiled with gcj.  In future, consider adding
 	# support for weak references to pthread_* functions ala gthr.h API.
-	THREADSPEC='%{!pthread: %eUnder this configuration, the user must provide -pthread when linking.}'
+	THREADSPEC='%{!pthread: %{!shared: %eUnder this configuration, the user must provide -pthread when linking.}}'
 	;;
      *-*-freebsd*)
 	# FreeBSD 5 implements a model much closer to other modern UNIX