diff --git a/cbpp-welcome/data/usr/bin/cbpp-welcome b/cbpp-welcome/data/usr/bin/cbpp-welcome
index 17d3b9b..19235ca 100755
--- a/cbpp-welcome/data/usr/bin/cbpp-welcome
+++ b/cbpp-welcome/data/usr/bin/cbpp-welcome
@@ -2,9 +2,8 @@
 # Post installation script
 TEXTDOMAIN=cbpp-welcome
 
-
 CB_WELCOME_LIBDIR='/usr/lib/lib-cbpp-welcome'
-STEPS_BASIC=('apt-update' 'apt-dist-upgrade' 'install-printer-packages' 'install-java-packages' 'install-libreoffice' 'devel')
+STEPS_BASIC=('apt-update' 'apt-dist-upgrade' 'install-bluetooth' 'install-printer-packages' 'install-java-packages' 'install-libreoffice' 'devel')
 STEPS_DEVEL=('devel-install-version-control-tools' 'devel-install-ssh-server' 'devel-install-lamp-stack' 'devel-install-packaging-tools')
 
 createFlag() {
@@ -55,8 +54,15 @@ installPage() {
 
     if setupPage "$title" "$text" "$prompt"; then
         sudo apt-get install -y "${@:3}"
+        
+		if ["${a:3}" = "blueman"]; then
+			# Autostart the Blueman systray applet
+			printf "%s\n" "# Start blueman-applet for systray" "blueman-applet &" >> $HOME/.config/openbox/autostart
+		fi
+		
         return 0
     fi
+	
     return 1
 }
 
diff --git a/cbpp-welcome/data/usr/lib/lib-cbpp-welcome/install-bluetooth b/cbpp-welcome/data/usr/lib/lib-cbpp-welcome/install-bluetooth
new file mode 100644
index 0000000..783fb98
--- /dev/null
+++ b/cbpp-welcome/data/usr/lib/lib-cbpp-welcome/install-bluetooth
@@ -0,0 +1,3 @@
+installPage $"Bluetooth Support" \
+    $"By default, CrunchBangPlusPlus does not come with Bluetooth support. Would you like to install the Bluetooth drivers and their user interface now?" \
+    'blueman'