diff --git a/target/linux/adm5120/base-files/etc/config/system b/target/linux/adm5120/base-files/etc/config/system
index 30f92ccc90..e7757d3da1 100644
--- a/target/linux/adm5120/base-files/etc/config/system
+++ b/target/linux/adm5120/base-files/etc/config/system
@@ -2,8 +2,11 @@ config system
 	option hostname	OpenWrt
 	option timezone	UTC
 
-config rdate
-	option interface	wan
+config timeserver
+	list server	0.openwrt.pool.ntp.org
+	list server	1.openwrt.pool.ntp.org
+	list server	2.openwrt.pool.ntp.org
+	list server	3.openwrt.pool.ntp.org
 
 config led
 	option sysfs		lan1
diff --git a/target/linux/at91/flexibity/base-files/etc/config/system b/target/linux/at91/flexibity/base-files/etc/config/system
index 140ac69c33..18f1f0effc 100644
--- a/target/linux/at91/flexibity/base-files/etc/config/system
+++ b/target/linux/at91/flexibity/base-files/etc/config/system
@@ -2,5 +2,8 @@ config 'system'
 	option 'timezone' 'UTC'
 	option 'hostname' 'flexibity'
 
-config 'rdate'
-	option 'server' 'ac-ntp0.net.cmu.edu ptbtime1.ptb.de ac-ntp1.net.cmu.edu ntp.xs4all.nl ptbtime2.ptb.de cudns.cit.cornell.edu ptbtime3.ptb.de'
+config timeserver
+	list server	0.openwrt.pool.ntp.org
+	list server	1.openwrt.pool.ntp.org
+	list server	2.openwrt.pool.ntp.org
+	list server	3.openwrt.pool.ntp.org
diff --git a/target/linux/atheros/base-files/etc/config/system b/target/linux/atheros/base-files/etc/config/system
index 47faa3cc50..faf5d676c7 100644
--- a/target/linux/atheros/base-files/etc/config/system
+++ b/target/linux/atheros/base-files/etc/config/system
@@ -2,6 +2,12 @@ config system
 	option hostname OpenWrt
 	option timezone UTC
 
+config timeserver
+	list server	0.openwrt.pool.ntp.org
+	list server	1.openwrt.pool.ntp.org
+	list server	2.openwrt.pool.ntp.org
+	list server	3.openwrt.pool.ntp.org
+
 config button
 	option button	reset
 	option action	released
diff --git a/target/linux/kirkwood/base-files-Dockstar/etc/config/system b/target/linux/kirkwood/base-files-Dockstar/etc/config/system
index d3386cec25..7724007682 100644
--- a/target/linux/kirkwood/base-files-Dockstar/etc/config/system
+++ b/target/linux/kirkwood/base-files-Dockstar/etc/config/system
@@ -3,8 +3,11 @@ config system
         option 'hostname' 'OpenWrt'
         option 'timezone' 'UTC'
 
-config rdate
-        option 'interface' 'lan'
+config timeserver
+	list server	0.openwrt.pool.ntp.org
+	list server	1.openwrt.pool.ntp.org
+	list server	2.openwrt.pool.ntp.org
+	list server	3.openwrt.pool.ntp.org
 
 config led
         option 'sysfs' 'dockstar:green:health'
diff --git a/target/linux/x86/alix2/base-files/etc/config/system b/target/linux/x86/alix2/base-files/etc/config/system
index 28134b64c5..c952b97330 100644
--- a/target/linux/x86/alix2/base-files/etc/config/system
+++ b/target/linux/x86/alix2/base-files/etc/config/system
@@ -2,8 +2,11 @@ config system
 	option hostname	OpenWrt
 	option timezone	UTC
 
-config rdate
-	option interface	wan
+config timeserver
+	list server	0.openwrt.pool.ntp.org
+	list server	1.openwrt.pool.ntp.org
+	list server	2.openwrt.pool.ntp.org
+	list server	3.openwrt.pool.ntp.org
 
 config led
 	option default	1