diff --git a/configure b/configure
index af3862efcc..b25c599528 100755
--- a/configure
+++ b/configure
@@ -70,7 +70,7 @@ extralibs="-lsocket"
 fi ;;
 BSD/OS)
 v4l="no"
-audio_oss="no"
+audio_oss="yes"
 extralibs="-lpoll -lgnugetopt -lm"
 make="gmake"
 ;;
@@ -188,7 +188,7 @@ EOF
 $cc -o $TMPO $TMPC 2> /dev/null || _memalign=no
 fi
 
-if test "$1" = "-h" -o "$1" = "--help" ; then
+if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
 cat << EOF
 
 Usage: configure [options]
@@ -215,7 +215,7 @@ echo "  --extra-libs=ELIBS       add ELIBS [$ELIBS]"
 echo "  --cpu=CPU                force cpu to CPU  [$cpu]"
 echo "  --disable-mmx            disable mmx usage"
 echo "  --disable-audio-oss      disable OSS audio support [default=no]"
-echo "  --disable-v4l            video4linux grabbing [default=no]"
+echo "  --disable-v4l            disable video4linux grabbing [default=no]"
 echo "  --disable-network        disable network support [default=no]"
 echo "  --disable-simple_idct    disable simple IDCT routines [default=no]"
 echo "  --enable-gprof           enable profiling with gprof [$gprof]"