diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8ad2f81c8b7..fa8d9d2a56d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-18  Petr Salinger  <Petr.Salinger@seznam.cz>
+
+	* configure: Rebuilt.
+	* shlibpath.m4: Handle GNU/kFreeBSD.
+
 2006-09-14  Tom Tromey  <tromey@redhat.com>
 
 	PR boehm-gc/29068:
diff --git a/libjava/configure b/libjava/configure
index c12e66e33a4..f53b34810ab 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -4661,7 +4661,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux*|k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
diff --git a/libjava/shlibpath.m4 b/libjava/shlibpath.m4
index e09531a6abc..4bdd362ff5e 100644
--- a/libjava/shlibpath.m4
+++ b/libjava/shlibpath.m4
@@ -361,7 +361,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux*|k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no