--- libjava/classpath/ltconfig.orig	2011-02-13 11:45:53 UTC
+++ libjava/classpath/ltconfig
@@ -1128,17 +1128,17 @@ darwin* | rhapsody*)
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
-freebsd*)
+bsdsunix* | freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
   version_type=freebsd-$objformat
   case $version_type in
-    freebsd-elf*)
+    bsdsunix-elf*|freebsd-elf*)
       library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
       need_version=no
       need_lc=no
       need_lib_prefix=no
       ;;
-    freebsd-*)
+    bsdsunix-*|freebsd-*)
       library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
       need_version=yes
       ;;