diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds
old mode 100644
new mode 100755
similarity index 99%
rename from target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
rename to target/linux/ar71xx/base-files/etc/board.d/01_leds
index 39f472a5bb6..952e7b88d5b
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011 OpenWrt.org
+# Copyright (C) 2011-2015 OpenWrt.org
 #
 
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-new.sh
 . /lib/ar71xx.sh
 
+board_config_update
+
 board=$(ar71xx_board_name)
 
 case "$board" in
@@ -651,6 +653,6 @@ zcn-1523h-5)
 	;;
 esac
 
-ucidef_commit_leds
+board_config_flush
 
 exit 0
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
old mode 100644
new mode 100755
similarity index 98%
rename from target/linux/ar71xx/base-files/etc/uci-defaults/02_network
rename to target/linux/ar71xx/base-files/etc/board.d/02_network
index 2765adb1123..fffe06b7a0f
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -1,19 +1,18 @@
 #!/bin/sh
 #
-# Copyright (C) 2011 OpenWrt.org
+# Copyright (C) 2011-2015 OpenWrt.org
 #
 
-[ -e /etc/config/network ] && exit 0
-
-touch /etc/config/network
-
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-new.sh
 . /lib/ar71xx.sh
 
+board_config_update
+
 ucidef_set_interface_loopback
 
 board=$(ar71xx_board_name)
 
+
 case "$board" in
 all0315n |\
 all0258n |\
@@ -527,6 +526,6 @@ wndr3700)
 	;;
 esac
 
-uci commit network
+board_config_flush
 
 exit 0