diff --git a/target/linux/cns21xx/base-files/etc/uci-defaults/leds b/target/linux/cns21xx/base-files/etc/uci-defaults/leds
new file mode 100755
index 0000000000..bdebb6c1ca
--- /dev/null
+++ b/target/linux/cns21xx/base-files/etc/uci-defaults/leds
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults.sh
+. /lib/cns21xx.sh
+
+board=$(get_board_name)
+
+case "$board" in
+"ns-k330")
+	ucidef_set_led_netdev "eth_orange" "ETH (orange)" "ns-k330:orange:eth" "eth0"
+	ucidef_set_led_usbdev "usb1" "USB1" "ns-k330:green:usb1" "1-1"
+	ucidef_set_led_usbdev "usb2" "USB2" "ns-k330:green:usb2" "1-2"
+	;;
+fi
+
+ucidef_commit_leds
+
+exit 0
diff --git a/target/linux/cns21xx/base-files/etc/uci-defaults/ns-k330 b/target/linux/cns21xx/base-files/etc/uci-defaults/ns-k330
deleted file mode 100755
index ea25d16588..0000000000
--- a/target/linux/cns21xx/base-files/etc/uci-defaults/ns-k330
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-
-. /lib/cns21xx.sh
-
-board=$(get_board_name)
-
-ns_k330_set_leds() {
-	uci batch <<EOF
-set system.led_eth_orange='led'
-set system.led_eth_orange.name='eth_orange'
-set system.led_eth_orange.sysfs='ns-k330:orange:eth'
-set system.led_eth_orange.trigger='netdev'
-set system.led_eth_orange.dev='eth0'
-set system.led_eth_orange.mode='link'
-set system.led_eth_green='led'
-set system.led_eth_green.name='eth_green'
-set system.led_eth_green.sysfs='ns-k330:green:eth'
-set system.led_eth_green.trigger='netdev'
-set system.led_eth_green.dev='eth0'
-set system.led_eth_green.mode='tx rx'
-set system.usb_led1=led
-set system.usb_led1.name='USB'
-set system.usb_led1.sysfs='ns-k330:green:usb1'
-set system.usb_led1.trigger='usbdev'
-set system.usb_led1.dev='1-1'
-set system.usb_led1.interval='50'
-set system.usb_led2=led
-set system.usb_led2.name='USB'
-set system.usb_led2.sysfs='ns-k330:green:usb2'
-set system.usb_led2.trigger='usbdev'
-set system.usb_led2.dev='1-2'
-set system.usb_led2.interval='50'
-commit system
-EOF
-}
-
-if [ "${board}" == "ns-k330" ]; then
-	ns_k330_set_leds
-fi