diff --git a/files/lib/gluon/ssid-changer/ssid-changer.sh b/files/lib/gluon/ssid-changer/ssid-changer.sh
index a637efd0bf6d2ee38fdcbf35011c23ebacd8c0cd..57b9befb62efc8d5a08a4ea23d81d75d2cbe62f4 100755
--- a/files/lib/gluon/ssid-changer/ssid-changer.sh
+++ b/files/lib/gluon/ssid-changer/ssid-changer.sh
@@ -1,4 +1,3 @@
-
 #!/bin/sh
 
 # At first some Definitions:
@@ -6,24 +5,24 @@
 ONLINE_SSID='Freifunk'
 OFFLINE_PREFIX='FF_OFFLINE_' # Use something short to leave space for the nodename
 
-#Is there an active Gateway
+#Is there an active Gateway?
 GATEWAY_TQ=`batctl gwl | grep "^=>" | cut -d" " -f3 | tr -d "()"`
 if [ $GATEWAY_TQ -gt 50 ];
 then
 	echo "Gateway TQ is $GATEWAY_TQ node is online"
-	for RADIO in $(iw dev | grep client | cut -d" " -f2); do
-		CURRENT_SSID=`iw dev $RADIO info | grep ssid | cut -d" " -f2` # Is there a better way to fetch the SSID wich is active?
+	for HOSTAPD in $(ls /var/run/hostapd-phy*); do
+		CURRENT_SSID=`grep '^ssid=' $HOSTAPD | cut -d"=" -f2`
 		if [ $CURRENT_SSID == $ONLINE_SSID ]
 		then
 			echo "SSID $CURRENT_SSID is correct, noting to do"
+			HUP_NEEDED=0
 		else
 			echo "SSID is $CURRENT_SSID, change to $ONLINE_SSID"
-			NUM=`echo $RADIO | tail -c 2`
-			`uci set wireless.client_radio$NUM.ssid=$ONLINE_SSID`
-			wifi
+			sed -i s/^ssid=.*/ssid=$ONLINE_SSID/ $HOSTAPD
+			HUP_NEEDED=1 # HUP here would be to early for dualband devices
 		fi
 	done
-
+	
 else
 	echo "Gateway TQ is $GATEWAY_TQ node is considered offline"
 	NODENAME=`uname -n`
@@ -31,20 +30,25 @@ else
 		HALF=$(( (28 - ${#OFFLINE_PREFIX} ) / 2 ))
 		SKIP=$(( ${#NODENAME} - $HALF ))
 		OFFLINE_SSID=$OFFLINE_PREFIX${NODENAME:0:$HALF}...${NODENAME:$SKIP:${#NODENAME}} # use the first and last part of the nodename for nodes with long name
-		else
-			OFFLINE_SSID=`$OFFLINE_PREFIX$NODENAME`
-		fi
-	for RADIO in $(iw dev | grep client | cut -d" " -f2); do
-		CURRENT_SSID=`iw dev $RADIO info | grep ssid | cut -d" " -f2`
+	else
+		OFFLINE_SSID=`$OFFLINE_PREFIX$NODENAME`
+	fi
+	for HOSTAPD in $(ls /var/run/hostapd-phy*); do
+		CURRENT_SSID=`grep '^ssid=' $HOSTAPD | cut -d"=" -f2`
 		if [ $CURRENT_SSID == $OFFLINE_SSID ]
 		then
 			echo "SSID $CURRENT_SSID is correct, noting to do"
+			HUP_NEEDED=0
 		else
 			echo "SSID is $CURRENT_SSID, change to $OFFLINE_SSID"
-			NUM=`echo $RADIO | tail -c 2`
-			`uci set wireless.client_radio$NUM.ssid="$OFFLINE_SSID"`
-			wifi
+			sed -i "s/^ssid=.*/ssid=$OFFLINE_SSID/" $HOSTAPD
+			HUP_NEEDED=1 # HUP here would be to early for dualband devices
 		fi
-
 	done
 fi
+
+if [ $HUP_NEEDED == 1 ]; then
+	killall -HUP hostapd # Send HUP to all hostapd um die neue SSID zu laden
+	HUP_NEEDED=0
+	echo "HUP!"
+fi