diff --git a/root_file_system/default/etc/nodewatcher.sh b/root_file_system/default/etc/nodewatcher.sh
index 75c34de7..0f72e03d 100755
--- a/root_file_system/default/etc/nodewatcher.sh
+++ b/root_file_system/default/etc/nodewatcher.sh
@@ -441,6 +441,17 @@ crawl() {
 				if [ $error_level -gt "1" ]; then
 					echo "`date`: Das Senden der Statusdaten war nach dem `expr $i + 1`. Mal erfolgreich" >> $logfile
 				fi
+
+				netmon_hostname="`echo $api_return | cut '-d;' -f2`"
+				if [ "$netmon_hostname" != "`cat /proc/sys/kernel/hostname`" ]; then
+					if [ $error_level -gt "1" ]; then
+						echo "`date`: Setze neuen Hostname (Hostname synchronisation)" >> $logfile
+					fi
+					uci set system.@system[0].hostname=$netmon_hostname
+					uci commit
+					echo $netmon_hostname > /proc/sys/kernel/hostname
+				fi
+
 				break;
 			else
 				if [ $error_level -gt "0" ]; then
diff --git a/root_file_system/default/etc/tincstart.sh b/root_file_system/default/etc/tincstart.sh
index 1dbd5eeb..8a7536c7 100755
--- a/root_file_system/default/etc/tincstart.sh
+++ b/root_file_system/default/etc/tincstart.sh
@@ -19,10 +19,12 @@ then
 	hostname=$(cat /proc/sys/kernel/hostname)
 
 	if [ "$hostname" == "OpenWrt" ]
+	then
 		hostname=""
 	fi
 
 	if [ "$hostname" == "" ]
+	then
 	  hostname=$(ifconfig br-mesh | grep HWaddr | awk '{ print $5 }'|sed -e 's/://g')
 	fi