diff --git a/board/poppy/gpio.inc b/board/poppy/gpio.inc
index 82b89ead32..3179578de0 100644
--- a/board/poppy/gpio.inc
+++ b/board/poppy/gpio.inc
@@ -106,7 +106,8 @@ GPIO(USB2_OTG_ID,		PIN(A, 1), GPIO_ODR_LOW)			/* OTG ID */
 GPIO(USB2_OTG_VBUSSENSE,	PIN(9, 5), GPIO_OUT_LOW)			/* OTG VBUS Sense */
 
 /* LEDs (2 colors on each port) */
-GPIO(LED_YELLOW_C0,		PIN(3, 2), GPIO_OUT_LOW)
+GPIO(LED_YELLOW_C0,		PIN(2, 7), GPIO_OUT_LOW)			/* This is from rev4 */
+GPIO(LED_YELLOW_C0_OLD,		PIN(3, 2), GPIO_OUT_LOW)			/* This is for rev1 to rev3 */
 GPIO(LED_WHITE_C0,		PIN(C, 6), GPIO_OUT_LOW)
 GPIO(LED_YELLOW_C1,		PIN(3, 1), GPIO_OUT_LOW)
 GPIO(LED_WHITE_C1,		PIN(3, 0), GPIO_OUT_LOW)
diff --git a/board/poppy/led.c b/board/poppy/led.c
index 29f5b7e7c6..c079c18669 100644
--- a/board/poppy/led.c
+++ b/board/poppy/led.c
@@ -14,6 +14,7 @@
 #include "hooks.h"
 #include "host_command.h"
 #include "led_common.h"
+#include "system.h"
 #include "util.h"
 
 #define BAT_LED_ON 1
@@ -35,7 +36,9 @@ enum led_color {
 
 static void side_led_set_color(int port, enum led_color color)
 {
-	gpio_set_level(port ? GPIO_LED_YELLOW_C1 : GPIO_LED_YELLOW_C0,
+	int yellow_c0 = (system_get_board_version() >= 4) ?
+			GPIO_LED_YELLOW_C0 : GPIO_LED_YELLOW_C0_OLD;
+	gpio_set_level(port ? GPIO_LED_YELLOW_C1 : yellow_c0,
 		(color == LED_AMBER) ? BAT_LED_ON : BAT_LED_OFF);
 	gpio_set_level(port ? GPIO_LED_WHITE_C1 : GPIO_LED_WHITE_C0,
 		(color == LED_WHITE) ? BAT_LED_ON : BAT_LED_OFF);