--- libjava/classpath/config.rpath.orig	2011-11-29 20:12:00 UTC
+++ libjava/classpath/config.rpath
@@ -365,7 +365,7 @@ else
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd* | dragonfly*)
+    bsdsunix* | freebsd* | dragonfly*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
@@ -531,7 +531,7 @@ case "$host_os" in
   dgux*)
     library_names_spec='$libname$shrext'
     ;;
-  freebsd* | dragonfly*)
+  bsdsunix* | freebsd* | dragonfly*)
     case "$host_os" in
       freebsd[23].*)
         library_names_spec='$libname$shrext$versuffix' ;;