diff --git a/install/system/services/menu b/install/system/services/menu
index f5b5bd4..487c492 100644
--- a/install/system/services/menu
+++ b/install/system/services/menu
@@ -20,6 +20,13 @@ else
 fi
 options+=("net-snmp" "SNMP Server" off)
 options+=("samba" "Server SMB" off)
+if (dmesg |grep Bluetooth) then
+  options+=("bluez" "" on)
+  options+=("bluez-libs" "" on)
+else
+  options+=("bluez" "" off)
+  options+=("bluez-libs" "" off)
+fi
 options+=("syslog-ng" "" off)
 options+=("pkgstats" "" off)
 options+=("ntp" "" off)
@@ -58,6 +65,9 @@ for itm in $sel; do
     '"cronie"')
       svcenable cronie
     ;;
+    '"bluez"')
+      svcenable bluetooth "Bluetooth Service"
+    ;;
     '"ntp"')
       svcenable ntpd "NTP Server"
     ;;
diff --git a/install/system/sound/sound b/install/system/sound/sound
index 00758c8..e609406 100644
--- a/install/system/sound/sound
+++ b/install/system/sound/sound
@@ -7,7 +7,11 @@ options+=("alsa-plugins" "Extra alsa plugins" on)
 #options+=("lib32-alsa-plugins" "Extra alsa plugins" on)
 options+=("pulseaudio" "Sound server" on)
 options+=("pulseaudio-alsa" "ALSA Configuration for PulseAudio" on)
-options+=("pulseaudio-bluetooth" "A2DP support for PulseAudio" off)
+if (dmesg |grep Bluetooth) then
+  options+=("pulseaudio-bluetooth" "A2DP support for PulseAudio" on)
+else
+  options+=("pulseaudio-bluetooth" "A2DP support for PulseAudio" off)
+fi
 options+=("pulseaudio-equalizer" "Equalizer for PulseAudio" off)
 
 sel=$(whiptail --backtitle "$apptitle" --title "System Sound Install" --checklist "" --cancel-button "Back" 0 0 0 \