diff --git a/packages/network/bluez/build b/packages/network/bluez/build
index 33e97f9f70..62909d992c 100755
--- a/packages/network/bluez/build
+++ b/packages/network/bluez/build
@@ -22,6 +22,12 @@
 
 . config/options
 
+if [ "$ALSA_SUPPORT" = "yes" ]; then
+  BLUEZ_ALSA="--enable-audio --enable-alsa"
+else
+  BLUEZ_ALSA="--disable-audio --disable-alsa"
+fi
+
 if [ "$DEBUG" = "yes" ]; then
   DEBUG_CONFIG="--enable-debug"
 else
@@ -52,12 +58,11 @@ cd $PKG_BUILD
             --disable-proximity \
             --disable-serial \
             --enable-input \
-            --enable-audio \
             --enable-service \
             --enable-health \
             --disable-pnat \
             --disable-gstreamer \
-            --enable-alsa \
+            $BLUEZ_ALSA \
             --enable-usb \
             --disable-tracer \
             --enable-datafiles \
diff --git a/packages/network/bluez/install b/packages/network/bluez/install
index 19e4d5c3c0..af439b9fde 100755
--- a/packages/network/bluez/install
+++ b/packages/network/bluez/install
@@ -28,9 +28,12 @@ mkdir -p $INSTALL/etc/bluetooth
 #  cp $PKG_BUILD/src/main.conf $INSTALL/etc/bluetooth
   cp $PKG_DIR/config/main.conf $INSTALL/etc/bluetooth
   cp $PKG_BUILD/tools/rfcomm.conf $INSTALL/etc/bluetooth
-  cp $PKG_BUILD/audio/audio.conf $INSTALL/etc/bluetooth
   cp $PKG_BUILD/input/input.conf $INSTALL/etc/bluetooth
 
+  if [ "$ALSA_SUPPORT" = yes ]; then
+    cp $PKG_BUILD/audio/audio.conf $INSTALL/etc/bluetooth
+  fi
+
 mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d
 
@@ -47,8 +50,10 @@ mkdir -p $INSTALL/lib/udev/rules.d
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
 
-mkdir -p $INSTALL/usr/lib/alsa
-  cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa
+if [ "$ALSA_SUPPORT" = yes ]; then
+  mkdir -p $INSTALL/usr/lib/alsa
+    cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa
+fi
 
 mkdir -p $INSTALL/usr/lib/bluetooth/plugins
 
diff --git a/packages/network/bluez/meta b/packages/network/bluez/meta
index 6071ab0b4a..970fafb97d 100644
--- a/packages/network/bluez/meta
+++ b/packages/network/bluez/meta
@@ -27,8 +27,8 @@ PKG_SITE="http://www.bluez.org/"
 #PKG_URL="http://www.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
 #PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="alsa-lib libusb-compat dbus glib"
-PKG_BUILD_DEPENDS="toolchain alsa-lib libusb-compat dbus glib"
+PKG_DEPENDS="libusb-compat dbus glib"
+PKG_BUILD_DEPENDS="toolchain libusb-compat dbus glib"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="bluez: Bluetooth Tools and System Daemons for Linux."
@@ -36,3 +36,8 @@ PKG_LONGDESC="Bluetooth Tools and System Daemons for Linux."
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
+
+if [ "$ALSA_SUPPORT" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS alsa-lib"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS alsa-lib"
+fi