diff --git a/configure b/configure
index d7069909bf..953095bfe8 100755
--- a/configure
+++ b/configure
@@ -21,6 +21,7 @@ prefix="/usr/local"
 cross_prefix=""
 cc="gcc"
 ar="ar"
+make="make"
 strip="strip"
 cpu=`uname -m`
 mmx="default"
@@ -64,6 +65,11 @@ else
 echo "Not sure building for net_server will succeed... good luck."
 extralibs="-lsocket"
 fi ;;
+BSD/OS)
+grab="no"
+extralibs="-lpoll -lgnugetopt -lm"
+make="gmake"
+;;
 *) ;;
 esac
 
@@ -88,6 +94,8 @@ for opt do
   ;;
   --cc=*) cc=`echo $opt | cut -d '=' -f 2`
   ;;
+  --make=*) make=`echo $opt | cut -d '=' -f 2`
+  ;;
   --extra-cflags=*) CFLAGS="${opt#--extra-cflags=}"
   ;;
   --extra-ldflags=*) LDFLAGS=${opt#--extra-ldflags=}
@@ -189,6 +197,7 @@ echo "Advanced options (experts only):"
 echo "  --source-path=PATH       path of source code [$source_path]"
 echo "  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]"
 echo "  --cc=CC                  use C compiler CC [$cc]"
+echo "  --make=MAKE              use specified make [$make]"
 echo "  --extra-cflags=ECFLAGS   add ECFLAGS to CFLAGS [$CFLAGS]"
 echo "  --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]"
 echo "  --extra-libs=ELIBS       add ELIBS [$ELIBS]"
@@ -203,6 +212,7 @@ fi
 echo "Install prefix   $prefix"
 echo "Source path      $source_path"
 echo "C compiler       $cc"
+echo "make             $make"
 echo "CPU              $cpu"
 echo "Big Endian       $bigendian"
 echo "MMX enabled      $mmx"
@@ -217,7 +227,7 @@ echo "# Automatically generated by configure - do not modify" > config.mak
 echo "/* Automatically generated by configure - do not modify */" > $TMPH
 
 echo "prefix=$prefix" >> config.mak
-echo "MAKE=make" >> config.mak
+echo "MAKE=$make" >> config.mak
 echo "CC=$cc" >> config.mak
 echo "AR=$ar" >> config.mak
 echo "STRIP=$strip" >> config.mak