diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
old mode 100755
new mode 100644
similarity index 99%
rename from target/linux/ar71xx/base-files/etc/board.d/01_leds
rename to target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index 244700fd8c..816ca42d69
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2015 OpenWrt.org
+# Copyright (C) 2011 OpenWrt.org
 #
 
-. /lib/functions/uci-defaults-new.sh
+. /lib/functions/uci-defaults.sh
 . /lib/ar71xx.sh
 
-board_config_update
-
 board=$(ar71xx_board_name)
 
 case "$board" in
@@ -669,6 +667,6 @@ zcn-1523h-5)
 	;;
 esac
 
-board_config_flush
+ucidef_commit_leds
 
 exit 0
diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
old mode 100755
new mode 100644
similarity index 98%
rename from target/linux/ar71xx/base-files/etc/board.d/02_network
rename to target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index 68e0caaa62..88071146a7
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -1,18 +1,19 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2015 OpenWrt.org
+# Copyright (C) 2011 OpenWrt.org
 #
 
-. /lib/functions/uci-defaults-new.sh
-. /lib/ar71xx.sh
+[ -e /etc/config/network ] && exit 0
+
+touch /etc/config/network
 
-board_config_update
+. /lib/functions/uci-defaults.sh
+. /lib/ar71xx.sh
 
 ucidef_set_interface_loopback
 
 board=$(ar71xx_board_name)
 
-
 case "$board" in
 all0315n |\
 all0258n |\
@@ -536,6 +537,6 @@ wndr3700)
 	;;
 esac
 
-board_config_flush
+uci commit network
 
 exit 0