diff --git a/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds b/target/linux/mcs814x/base-files/etc/board.d/01_leds
old mode 100644
new mode 100755
similarity index 81%
rename from target/linux/mcs814x/base-files/etc/uci-defaults/01_leds
rename to target/linux/mcs814x/base-files/etc/board.d/01_leds
index 0c6972d8be7..3b1de4ae9b3
--- a/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/mcs814x/base-files/etc/board.d/01_leds
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2015 OpenWrt.org
 #
 
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-new.sh
 . /lib/mcs814x.sh
 
+board_config_update
+
 board=$(mcs814x_board_name)
 
 case "$board" in
@@ -21,6 +23,6 @@ rbt-832)
 	;;
 esac
 
-ucidef_commit_leds
+board_config_flush
 
 exit 0
diff --git a/target/linux/mcs814x/base-files/etc/board.d/02_network b/target/linux/mcs814x/base-files/etc/board.d/02_network
new file mode 100755
index 00000000000..a447923f427
--- /dev/null
+++ b/target/linux/mcs814x/base-files/etc/board.d/02_network
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults-new.sh
+
+board_config_update
+ucidef_set_interface_lan "eth0"
+board_config_flush
+
+exit 0
diff --git a/target/linux/mcs814x/base-files/etc/config/network b/target/linux/mcs814x/base-files/etc/config/network
deleted file mode 100644
index cec7b2525cf..00000000000
--- a/target/linux/mcs814x/base-files/etc/config/network
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2012 OpenWrt.org
-
-config interface loopback
-	option ifname	lo
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-config interface lan
-	option ifname	eth0
-	option proto	static
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
-	option ip6assign 60
-
-config interface wan6
-	option ifname   eth0
-	option proto    dhcpv6
-
-config globals globals
-	option ula_prefix auto