diff --git a/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches b/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches
new file mode 100755
index 0000000000..9a1be1a8fa
--- /dev/null
+++ b/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults-new.sh
+. /lib/ar71xx.sh
+
+board_config_update
+
+board=$(ar71xx_board_name)
+
+case "$board" in
+nanostation-m)
+	ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "8"
+	;;
+nanostation-m-xw)
+	ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "2"
+	;;
+cpe510)
+	ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "20"
+	;;
+esac
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches b/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
deleted file mode 100644
index b41f27554b..0000000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-
-. /lib/functions/uci-defaults.sh
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-case "$board" in
-nanostation-m)
-	ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "8"
-	;;
-nanostation-m-xw)
-	ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "2"
-	;;
-cpe510)
-	ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "20"
-	;;
-esac
-
-ucidef_commit_gpio_switches
-
-exit 0