diff --git a/config/backup/includes/bluez b/config/backup/includes/bluetooth
similarity index 100%
rename from config/backup/includes/bluez
rename to config/backup/includes/bluetooth
diff --git a/config/rootfiles/packages/bluez b/config/rootfiles/packages/bluetooth
similarity index 98%
rename from config/rootfiles/packages/bluez
rename to config/rootfiles/packages/bluetooth
index 7cc1e4f0a..1e05f9201 100644
--- a/config/rootfiles/packages/bluez
+++ b/config/rootfiles/packages/bluetooth
@@ -1,7 +1,7 @@
 srv/web/ipfire/cgi-bin/bluetooth.cgi
 var/ipfire/menu.d/EX-bluetooth.menu
 var/ipfire/bluetooth/settings
-var/ipfire/backup/addons/includes/bluez
+var/ipfire/backup/addons/includes/bluetooth
 etc/rc.d/init.d/bluetooth
 etc/rc.d/rc3.d/S16bluetooth
 etc/rc.d/rc0.d/K84bluetooth
diff --git a/lfs/bluez b/lfs/bluetooth
similarity index 99%
rename from lfs/bluez
rename to lfs/bluetooth
index 93ffc5a08..e5df30d1f 100644
--- a/lfs/bluez
+++ b/lfs/bluetooth
@@ -31,7 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = bluez
+PROG       = bluetooth
 PAK_VER    = 1
 
 DEPS       = "dbus glib"
diff --git a/make.sh b/make.sh
index d5dc32722..4ecf3df42 100755
--- a/make.sh
+++ b/make.sh
@@ -589,7 +589,7 @@ buildipfire() {
   ipfiremake tftp-hpa
   ipfiremake cpufrequtils
   ipfiremake dbus
-  ipfiremake bluez
+  ipfiremake bluetooth
   ipfiremake gutenprint
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index f93ae8ef2..e6149adcb 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -35,6 +35,7 @@ case "${1}" in
 		# Bring blue up (but not at boot)
 		if [ "$(basename $0)" == "hostapd" ]; then
 		    /etc/rc.d/init.d/networking/blue start
+		    /etc/rc.d/init.d/dhcp restart
 		fi
                 ;;