diff --git a/config/hostapd/hostapd.conf b/config/hostapd/hostapd.conf
index 642b682a3..807c35c72 100644
--- a/config/hostapd/hostapd.conf
+++ b/config/hostapd/hostapd.conf
@@ -2,7 +2,7 @@ interface=blue0
 driver=madwifi
 auth_algs=3
 wpa=1
-wpa_passphrase=IPFire
+wpa_passphrase=IPFire-2.x
 wpa_key_mgmt=WPA-PSK
 wpa_pairwise=TKIP CCMP
 debug=0
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index a6b0575f3..271aaab92 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -5,6 +5,7 @@
 case "${1}" in
         start)
 		boot_mesg -n "Starting hostapd... "
+		mkdir -p /var/run/hostapd
 		# enable wlan module of collectd
 		sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
                 /usr/bin/wlanconfig ath0 destroy