diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 855d3a40b1..6c40f62e83 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -127,7 +127,7 @@ get_status_led() {
 		status_led="wp543:green:diag"
 		;;
 	wrt400n)
-		status_led="wrt400n:green:status"
+		status_led="wrt400n:blue:wps"
 		;;
 	wrt160nl)
 		status_led="wrt160nl:blue:wps"
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
index 8bd82b983e..6d8d55fafa 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
@@ -21,10 +21,10 @@
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 
-#define WRT400N_GPIO_LED_ORANGE	5
-#define WRT400N_GPIO_LED_GREEN	4
-#define WRT400N_GPIO_LED_POWER	1
-#define WRT400N_GPIO_LED_WLAN	0
+#define WRT400N_GPIO_LED_POWER		1
+#define WRT400N_GPIO_LED_WPS_BLUE	4
+#define WRT400N_GPIO_LED_WPS_AMBER	5
+#define WRT400N_GPIO_LED_WLAN		6
 
 #define WRT400N_GPIO_BTN_RESET	8
 #define WRT400N_GPIO_BTN_WLSEC	3
@@ -93,21 +93,22 @@ static struct flash_platform_data wrt400n_flash_data = {
 
 static struct gpio_led wrt400n_leds_gpio[] __initdata = {
 	{
-		.name		= "wrt400n:green:status",
-		.gpio		= WRT400N_GPIO_LED_GREEN,
+		.name		= "wrt400n:blue:wps",
+		.gpio		= WRT400N_GPIO_LED_WPS_BLUE,
 		.active_low	= 1,
 	}, {
-		.name		= "wrt400n:amber:aoss",
-		.gpio		= WRT400N_GPIO_LED_ORANGE,
+		.name		= "wrt400n:amber:wps",
+		.gpio		= WRT400N_GPIO_LED_WPS_AMBER,
 		.active_low	= 1,
 	}, {
-		.name		= "wrt400n:green:wlan",
+		.name		= "wrt400n:blue:wlan",
 		.gpio		= WRT400N_GPIO_LED_WLAN,
 		.active_low	= 1,
 	}, {
-		.name		= "wrt400n:green:power",
+		.name		= "wrt400n:blue:power",
 		.gpio		= WRT400N_GPIO_LED_POWER,
-		.active_low	= 1,
+		.active_low	= 0,
+		.default_trigger = "default-on",
 	}
 };