diff --git a/ChangeLog b/ChangeLog
index 173925243..b7f464e5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Replace -pthread by -lpthread for 
+	Freebsd, too.  (#475619, Roy Marples)
+
 2007-09-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: When compiling against system pcre, 
diff --git a/configure.in b/configure.in
index dbd2235c4..54e84688a 100644
--- a/configure.in
+++ b/configure.in
@@ -1961,9 +1961,10 @@ fi
 # 
 #  a) GCC < 3.3 for Linux doesn't include -lpthread when
 #     building shared libraries with linux.
+#  b) FreeBSD doesn't do this either.
 #
 case $host in
-  *-*-linux*)
+  *-*-freebsd*|*-*-linux*)
     G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
     ;;
   *)