diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/dir-825 b/target/linux/ar71xx/base-files/etc/uci-defaults/dir-825
deleted file mode 100755
index 7aa32a4ef9..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/dir-825
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-dir825b1_setup_leds() {
-	uci batch <<EOF
-set system.usb_led=led
-set system.usb_led.name='USB'
-set system.usb_led.sysfs='dir825b1:blue:usb'
-set system.usb_led.trigger='usbdev'
-set system.usb_led.dev='1-1'
-set system.usb_led.interval='50'
-commit system
-EOF
-}
-
-if [ "${board}" == "dir-825-b1" ]; then
-	dir825b1_setup_leds
-fi
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/leds b/target/linux/ar71xx/base-files/etc/uci-defaults/leds
new file mode 100755
index 0000000000..cd910cca6e
--- /dev/null
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/leds
@@ -0,0 +1,144 @@
+#!/bin/sh
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+
+COMMIT_SYSTEM=0
+
+set_led_netdev() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local dev=$4
+
+	uci -q get system.$cfg && return 0
+
+	uci batch <<EOF
+set system.$cfg='led'
+set system.$cfg.name='$name'
+set system.$cfg.sysfs='$sysfs'
+set system.$cfg.trigger='netdev'
+set system.$cfg.dev='$dev'
+set system.$cfg.mode='link tx rx'
+EOF
+	COMMIT_SYSTEM=1
+}
+
+set_led_usbdev() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local dev=$4
+
+	uci -q get system.$cfg && return 0
+
+	uci batch <<EOF
+set system.$cfg='led'
+set system.$cfg.name='$name'
+set system.$cfg.sysfs='$sysfs'
+set system.$cfg.trigger='usbdev'
+set system.$cfg.dev='$dev'
+set system.$cfg.interval='50'
+EOF
+	COMMIT_SYSTEM=1
+}
+
+set_led_wlan() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local trigger=$4
+
+	uci -q get system.$cfg && return 0
+
+	uci batch <<EOF
+set system.$cfg='led'
+set system.$cfg.name='$name'
+set system.$cfg.sysfs='$sysfs'
+set system.$cfg.trigger='$trigger'
+EOF
+	COMMIT_SYSTEM=1
+}
+
+set_led_default() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local default=$4
+
+	uci -q get system.$cfg && return 0
+
+	uci batch <<EOF
+set system.$cfg='led'
+set system.$cfg.name='$name'
+set system.$cfg.sysfs='$sysfs'
+set system.$cfg.default='$default'
+EOF
+	COMMIT_SYSTEM=1
+}
+
+. /lib/ar71xx.sh
+
+board=$(ar71xx_board_name)
+
+case "$board" in
+rb750)
+	set_led_default "act" "act" "rb750:green:act" "1"
+	set_led_netdev "port1" "port1" "rb750:green:port1" "eth1"
+	;;
+
+dir-825-b1)
+	set_led_usbdev "usb" "USB" "dir825b1:blue:usb" "1-1"
+	;;
+
+mzk-w04u)
+	set_led_usbdev "usb" "USB" "planex:green:usb" "1-1"
+	;;
+
+nbg460n_550n_550nh)
+	set_led_wlan "wlan" "WLAN" "nbg460n:green:wlan" "phy0tpt"
+	;;
+
+tl-mr3220 | \
+tl-mr3420 )
+	set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1"
+	;;
+
+tl-wr941nd)
+	set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	;;
+
+tl-wr1043nd)
+	set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
+	set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	;;
+
+wrt160nl)
+	set_led_wlan "wlan" "WLAN" "wrt160nl:blue:wlan" "phy0tpt"
+	;;
+
+wndr3700 | \
+wndr3700v2)
+	set_led_default "wan" "WAN LED (green)" "wndr3700:green:wan" "0"
+	set_led_usbdev "usb" "USB" "wndr3700:green:usb" "1-1"
+	;;
+
+wzr-hp-g300nh)
+	set_led_wlan "wlan" "Wireless" "buffalo:green:wireless" "phy0tpt"
+	set_led_netdev "router" "Router" "buffalo:green:router" "eth1"
+	set_led_usbdev "usb" "USB" "buffalo:blue:usb" "1-1"
+	;;
+
+zcn-1523h-2)
+	set_led_netdev "lan1" "lan1" "zcn-1523h:green:lan1" "eth0"
+	;;
+
+zcn-1523h-5)
+	set_led_netdev "lan1" "lan1" "zcn-1523h:green:lan1" "eth0"
+	set_led_netdev "lan2" "lan2" "zcn-1523h:green:lan2" "eth1"
+	;;
+esac
+
+[ "$COMMIT_SYSTEM" == "1" ] && uci commit system
+
+exit 0
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/mzk-w04nu b/target/linux/ar71xx/base-files/etc/uci-defaults/mzk-w04nu
deleted file mode 100755
index db3bcba552..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/mzk-w04nu
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-mzk_w04nu_setup_leds() {
-	uci batch <<EOF
-set system.usb_led=led
-set system.usb_led.name='USB'
-set system.usb_led.sysfs='planex:green:usb'
-set system.usb_led.trigger='usbdev'
-set system.usb_led.dev='1-1'
-set system.usb_led.interval='50'
-commit system
-EOF
-}
-
-if [ "${board}" == "mzk-w04u" ]; then
-	mzk_w04nu_setup_leds
-fi
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/nbg460n_550n_550nh b/target/linux/ar71xx/base-files/etc/uci-defaults/nbg460n_550n_550nh
deleted file mode 100755
index e7f16bf70d..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/nbg460n_550n_550nh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-nbg460n_550n_550nh_set_wlan_led() {
-	uci batch <<EOF
-set system.wlan_led=led
-set system.wlan_led.name='WLAN'
-set system.wlan_led.sysfs='nbg460n:green:wlan'
-set system.wlan_led.trigger='phy0tpt'
-commit system
-EOF
-}
-
-if [ "${board}" == "nbg460n_550n_550nh" ]; then
-	nbg460n_550n_550nh_set_wlan_led
-fi
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/rb750 b/target/linux/ar71xx/base-files/etc/uci-defaults/rb750
deleted file mode 100755
index 51de038be3..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/rb750
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-rb750_set_leds() {
-	uci batch <<EOF
-set system.led_act='led'
-set system.led_act.name='act'
-set system.led_act.sysfs='rb750:green:act'
-set system.led_act.default='1'
-set system.led_port1='led'
-set system.led_port1.name='port1'
-set system.led_port1.sysfs='rb750:green:port1'
-set system.led_port1.trigger='netdev'
-set system.led_port1.dev=eth1
-set system.led_port1.mode='link tx rx'
-commit system
-EOF
-}
-
-if [ "${board}" == "rb-750" ]; then
-	rb750_set_leds
-fi
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-mr3x20 b/target/linux/ar71xx/base-files/etc/uci-defaults/tl-mr3x20
deleted file mode 100755
index bdb7c3e785..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-mr3x20
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-tlmr3x20_setup_leds() {
-	uci batch <<EOF
-set system.usb_led=led
-set system.usb_led.name='USB'
-set system.usb_led.sysfs='tp-link:green:3g'
-set system.usb_led.trigger='usbdev'
-set system.usb_led.dev='1-1'
-set system.usb_led.interval='50'
-commit system
-EOF
-}
-
-case "${board}" in
-"tl-mr3220" | \
-"tl-mr3420" )
-	tlmr3x20_setup_leds
-	;;
-esac
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr1043nd b/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr1043nd
deleted file mode 100755
index e88cc54d69..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr1043nd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-tlwr1043nd_setup_leds() {
-	uci batch <<EOF
-set system.wlan_led=led
-set system.wlan_led.name='WLAN'
-set system.wlan_led.sysfs='tp-link:green:wlan'
-set system.wlan_led.trigger='phy0tpt'
-set system.usb_led=led
-set system.usb_led.name='USB'
-set system.usb_led.sysfs='tp-link:green:usb'
-set system.usb_led.trigger='usbdev'
-set system.usb_led.dev='1-1'
-set system.usb_led.interval='50'
-commit system
-EOF
-}
-
-if [ "${board}" == "tl-wr1043nd" ]; then
-	tlwr1043nd_setup_leds
-fi
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr941nd b/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr941nd
deleted file mode 100755
index 2b904734ce..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr941nd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-tl_wr941nd_set_wlan_led() {
-	uci batch <<EOF
-set system.wlan_led=led
-set system.wlan_led.name='WLAN'
-set system.wlan_led.sysfs='tp-link:green:wlan'
-set system.wlan_led.trigger='phy0tpt'
-commit system
-EOF
-}
-
-if [ "${board}" == "tl-wr941nd" ]; then
-	tl_wr941nd_set_wlan_led
-fi
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/wndr3700 b/target/linux/ar71xx/base-files/etc/uci-defaults/wndr3700
deleted file mode 100755
index 77fd057383..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/wndr3700
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-wndr3700_set_wan_led() {
-	uci batch <<EOF
-set system.wan_led=led
-set system.wan_led.sysfs='wndr3700:green:wan'
-set system.wan_led.name='WAN LED (green)'
-set system.wan_led.default='0'
-set system.usb_led=led
-set system.usb_led.name='USB'
-set system.usb_led.sysfs='wndr3700:green:usb'
-set system.usb_led.trigger='usbdev'
-set system.usb_led.dev='1-1'
-set system.usb_led.interval='50'
-commit system
-EOF
-}
-
-if [ "${board}" == "wndr3700" -o "${board}" == "wndr3700v2" ]; then
-	wndr3700_set_wan_led
-fi
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/wrt160nl b/target/linux/ar71xx/base-files/etc/uci-defaults/wrt160nl
index 7a31024396..dce28dde94 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/wrt160nl
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/wrt160nl
@@ -11,17 +11,6 @@ wrt160nl_fixtrx() {
 	mtd -o 32 fixtrx firmware
 }
 
-wrt160nl_setup_leds() {
-	uci batch <<EOF
-set system.wlan_led=led
-set system.wlan_led.name='WLAN'
-set system.wlan_led.sysfs='wrt160nl:blue:wlan'
-set system.wlan_led.trigger='phy0tpt'
-commit system
-EOF
-}
-
 if [ "${board}" == "wrt160nl" ]; then
 	wrt160nl_fixtrx
-	wrt160nl_setup_leds
 fi
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh b/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh
deleted file mode 100755
index 989435c1db..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-wzrhpg300nh_set_leds() {
-	uci batch <<EOF
-add system led
-set system.@led[-1]='led'
-set system.@led[-1].name='Wireless'
-set system.@led[-1].sysfs='buffalo:green:wireless'
-set system.@led[-1].trigger='phy0tpt'
-add system led
-set system.@led[-1]='led'
-set system.@led[-1].name='Router'
-set system.@led[-1].sysfs='buffalo:green:router'
-set system.@led[-1].trigger='netdev'
-set system.@led[-1].dev='eth1'
-set system.@led[-1].mode='link tx rx'
-add system led
-set system.@led[-1]='led'
-set system.@led[-1].name='USB'
-set system.@led[-1].sysfs='buffalo:blue:usb'
-set system.@led[-1].trigger='usbdev'
-set system.@led[-1].dev='1-1'
-set system.@led[-1].interval='50'
-commit system
-EOF
-}
-
-if [ "${board}" == "wzr-hp-g300nh" ]; then
-	wzrhpg300nh_set_leds
-fi
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/zcn-1523h-2 b/target/linux/ar71xx/base-files/etc/uci-defaults/zcn-1523h-2
deleted file mode 100755
index 4f77316357..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/zcn-1523h-2
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-zcn_set_leds() {
-	uci batch <<EOF
-set system.led_lan1='led'
-set system.led_lan1.name='lan1'
-set system.led_lan1.sysfs='zcn-1523h:green:lan1'
-set system.led_lan1.trigger='netdev'
-set system.led_lan1.dev='eth0'
-set system.led_lan1.mode='link tx rx'
-commit system
-EOF
-}
-
-if [ "${board}" == "zcn-1523h-2" ]; then
-	zcn_set_leds
-fi
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/zcn-1523h-5 b/target/linux/ar71xx/base-files/etc/uci-defaults/zcn-1523h-5
deleted file mode 100755
index c62f72f099..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/zcn-1523h-5
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-zcn_set_leds() {
-	uci batch <<EOF
-set system.led_lan1='led'
-set system.led_lan1.name='lan1'
-set system.led_lan1.sysfs='zcn-1523h:green:lan1'
-set system.led_lan1.trigger='netdev'
-set system.led_lan1.dev='eth0'
-set system.led_lan1.mode='link tx rx'
-set system.led_lan2='led'
-set system.led_lan2.name='lan2'
-set system.led_lan2.sysfs='zcn-1523h:green:lan2'
-set system.led_lan2.trigger='netdev'
-set system.led_lan2.dev='eth1'
-set system.led_lan2.mode='link tx rx'
-commit system
-EOF
-}
-
-if [ "${board}" == "zcn-1523h-5" ]; then
-	zcn_set_leds
-fi