diff --git a/target/linux/mvebu/base-files/etc/board.d/01_leds b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
old mode 100755
new mode 100644
similarity index 89%
rename from target/linux/mvebu/base-files/etc/board.d/01_leds
rename to target/linux/mvebu/base-files/etc/uci-defaults/01_leds
index eb245d85ae924fb9e812504790273b534a89d2e9..612f949da4ce252b6bb7c640af2c4b8fb5958764
--- a/target/linux/mvebu/base-files/etc/board.d/01_leds
+++ b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
@@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2015 OpenWrt.org
+# Copyright (C) 2014 OpenWrt.org
 #
 
-. /lib/functions/uci-defaults-new.sh
+. /lib/functions/uci-defaults.sh
 . /lib/mvebu.sh
 
-board_config_update
-
 board=$(mvebu_board_name)
 
 case "$board" in
@@ -34,6 +32,6 @@ armada-xp-linksys-mamba)
 
 esac
 
-board_config_flush
+ucidef_commit_leds
 
 exit 0
diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/uci-defaults/02_network
old mode 100755
new mode 100644
similarity index 86%
rename from target/linux/mvebu/base-files/etc/board.d/02_network
rename to target/linux/mvebu/base-files/etc/uci-defaults/02_network
index 803a4dc768c8fff280e67b9d466f6897c79a7e31..d1da59fb487e7cac049a8e65ac002ea42f13f9b6
--- a/target/linux/mvebu/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/base-files/etc/uci-defaults/02_network
@@ -3,10 +3,12 @@
 # Copyright (C) 2014-2015 OpenWrt.org
 #
 
-. /lib/functions/uci-defaults-new.sh
-. /lib/mvebu.sh
+[ -e /etc/config/network ] && exit 0
+
+touch /etc/config/network
 
-board_config_update
+. /lib/functions/uci-defaults.sh
+. /lib/mvebu.sh
 
 ucidef_set_interface_loopback
 
@@ -39,6 +41,6 @@ armada-xp-gp)
 	;;
 esac
 
-board_config_flush
+uci commit network
 
 exit 0