diff --git a/root_file_system/default/etc/rc.local b/root_file_system/default/etc/rc.local
index 5e726d9..d3748d2 100755
--- a/root_file_system/default/etc/rc.local
+++ b/root_file_system/default/etc/rc.local
@@ -33,8 +33,8 @@ if [[ "$BRMAC" != "$WLMAC" ]]; then
 fi
 fi
 
-# todo: find time-server in Freifunk-Network
-rdate -s time.fu-berlin.de
+# Starting NTP-Client Daemon
+ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
 
 sh /etc/firewall.user
 
diff --git a/root_file_system/dir300/etc/rc.local b/root_file_system/dir300/etc/rc.local
index 45d8f76..6345d9a 100755
--- a/root_file_system/dir300/etc/rc.local
+++ b/root_file_system/dir300/etc/rc.local
@@ -39,8 +39,8 @@ if [[ "$BRMAC" != "$WLMAC" ]]; then
 fi
 fi
 
-# todo: find time-server in Freifunk-Network
-rdate -s time.fu-berlin.de
+# Starting NTP-Client Daemon
+ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
 
 sh /etc/firewall.user
 
diff --git a/root_file_system/dir300b_adhoc/etc/rc.local b/root_file_system/dir300b_adhoc/etc/rc.local
index a59d88a..0589697 100755
--- a/root_file_system/dir300b_adhoc/etc/rc.local
+++ b/root_file_system/dir300b_adhoc/etc/rc.local
@@ -17,7 +17,8 @@ ifconfig br-mesh up
 ifdown lan
 ifup lan
 
-rdate -s time.fu-berlin.de
+# Starting NTP-Client Daemon
+ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
 
 chown root.root /etc/crontabs/root
 /etc/init.d/cron stop
diff --git a/root_file_system/dir300b_ap/etc/rc.local b/root_file_system/dir300b_ap/etc/rc.local
index a59d88a..0589697 100755
--- a/root_file_system/dir300b_ap/etc/rc.local
+++ b/root_file_system/dir300b_ap/etc/rc.local
@@ -17,7 +17,8 @@ ifconfig br-mesh up
 ifdown lan
 ifup lan
 
-rdate -s time.fu-berlin.de
+# Starting NTP-Client Daemon
+ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
 
 chown root.root /etc/crontabs/root
 /etc/init.d/cron stop
diff --git a/root_file_system/wr1043nd/etc/rc.local b/root_file_system/wr1043nd/etc/rc.local
index 808925a..ce25877 100755
--- a/root_file_system/wr1043nd/etc/rc.local
+++ b/root_file_system/wr1043nd/etc/rc.local
@@ -20,7 +20,8 @@ ifconfig br-mesh up
 ifdown lan
 ifup lan
 
-rdate -s time.fu-berlin.de
+# Starting NTP-Client Daemon
+ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
 
 chown root.root /etc/crontabs/root
 /etc/init.d/cron stop
diff --git a/root_file_system/wr741nd/etc/rc.local b/root_file_system/wr741nd/etc/rc.local
index 808925a..ce25877 100755
--- a/root_file_system/wr741nd/etc/rc.local
+++ b/root_file_system/wr741nd/etc/rc.local
@@ -20,7 +20,8 @@ ifconfig br-mesh up
 ifdown lan
 ifup lan
 
-rdate -s time.fu-berlin.de
+# Starting NTP-Client Daemon
+ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
 
 chown root.root /etc/crontabs/root
 /etc/init.d/cron stop
diff --git a/root_file_system/wrt54g_adhoc/etc/rc.local b/root_file_system/wrt54g_adhoc/etc/rc.local
index c2d4127..293ee84 100755
--- a/root_file_system/wrt54g_adhoc/etc/rc.local
+++ b/root_file_system/wrt54g_adhoc/etc/rc.local
@@ -17,7 +17,8 @@ ifconfig br-mesh up
 ifdown lan
 ifup lan
 
-rdate -s time.fu-berlin.de
+# Starting NTP-Client Daemon
+ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
 
 chown root.root /etc/crontabs/root
 /etc/init.d/cron stop