diff --git a/configure b/configure
index a881a13..b2dfbbb 100755
--- a/configure
+++ b/configure
@@ -16,6 +16,7 @@ echo "# Generated by $0 $*" >Makeconf
 cflags='-DKEYMAP_PATH=\"$(KEYMAP_PATH)\"'
 ldflags=''
 rpath=
+withsound='yes'
 
 for arg in $*; do
 optarg=`echo $arg | sed 's/[-a-z]*=//'`
@@ -70,6 +71,18 @@ case $arg in
   --with-ipv6)
     cflags="$cflags -DIPv6"
     ;;
+  --without-sound*)
+    withsound=no
+    ;;
+  --with-sound)
+    withsound=yes
+    ;;
+  --with-sound=oss)
+    withsound=$optarg
+    ;;
+  --with-sound=sun)
+    withsound=$optarg
+    ;;
   *)
     echo "Target directories:"
     echo " --prefix=PREFIX         location for architecture-independent files"
@@ -91,6 +104,8 @@ case $arg in
     echo " --with-debug-rdp5       enable debugging of RDP5 code"
     echo " --with-debug-clipboard  enable debugging of clipboard code"
     echo " --with-ipv6             enable support for IPv6"
+    echo " --without-sound         disable support for sound redirection"
+    echo " --with-sound=ARG        only detect sound-support for \"oss\" or \"sun\" (and BSD)"
     echo
     rm -f Makeconf
     exit 1
@@ -263,19 +278,19 @@ fi
 
 # Check for OSS sound support
 
-if [ -f /usr/include/sys/soundcard.h ]; then
+if [ -f /usr/include/sys/soundcard.h -a \( "$withsound" = "yes" -o "$withsound" = "oss" \) ]; then
     echo Sound support enabled: Open Sound System
     echo
     echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
     cflags="$cflags -DWITH_RDPSND"
-elif [ -f /usr/include/sys/audioio.h ]; then
+elif [ -f /usr/include/sys/audioio.h -a \( "$withsound" = "yes" -o "$withsound" = "sun" \) ]; then
     echo Sound support enabled: Sun/BSD
     echo
     echo "SOUNDOBJ    = rdpsnd.o rdpsnd_sun.o" >>Makeconf
     cflags="$cflags -DWITH_RDPSND"
 else
     echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audioio.h)"
-    echo "Currently supported systems are Open Sound System and Sun"
+    echo "Currently supported systems are Open Sound System (oss) and Sun/BSD (sun)"
     echo
 fi