diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fa8d9d2a56d..82872f77a1f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-18  Petr Salinger  <Petr.Salinger@seznam.cz>
+
+	* configure.host: Handle kfreebsd.
+
 2006-09-18  Petr Salinger  <Petr.Salinger@seznam.cz>
 
 	* configure: Rebuilt.
diff --git a/libjava/configure.host b/libjava/configure.host
index b2bdd5355f6..018d6172d41 100644
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -242,6 +242,10 @@ EOF
 	  rm -f conftest conftest.c
 	fi
 	;;
+   i[34567]86*-kfreebsd*-gnu | x86_64*-kfreebsd*-gnu)
+        libgcj_ld_symbolic='-Wl,-Bsymbolic'
+        slow_pthread_self=
+        ;;
   i[34567]86-*-solaris2.1[0-9]* )
 	sysdeps_dir=x86-64
 	DIVIDESPEC=-f%{m32:no-}%{!m32:%{!m64:no-}}%{m64:}use-divide-subroutine
@@ -320,7 +324,7 @@ case "${host}" in
 esac
 
 case "${host}" in
-  *linux*)
+  *linux*|*-kfreebsd*-gnu)
     use_libgcj_bc=yes
   ;;
   *)