--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -29,12 +29,16 @@
 #include <bcm63xx_dev_pcmcia.h>
 #include <bcm63xx_dev_spi.h>
 #include <board_bcm963xx.h>
+#include <bcm_tag.h>
 
 #define PFX	"board_bcm963xx: "
 
 #define BCM963XX_KEYS_POLL_INTERVAL		20
 #define BCM963XX_KEYS_DEBOUNCE_INTERVAL	(BCM963XX_KEYS_POLL_INTERVAL * 3)
 
+#define CFE_OFFSET_64K		0x10000
+#define CFE_OFFSET_128K		0x20000
+
 static struct bcm963xx_nvram nvram;
 static unsigned int mac_addr_used;
 static struct board_info board;
@@ -725,6 +729,29 @@ static int board_get_mac_address(u8 *mac
 	return 0;
 }
 
+static void __init boardid_fixup(u8 *boot_addr)
+{
+	struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
+
+	/* check if bcm_tag is at 64k offset */
+	if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) {
+		/* else try 128k */
+		tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
+		if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) {
+			/* No tag found */
+			printk(KERN_DEBUG "No bcm_tag found!\n");
+			return;
+		}
+	}
+	/* check if we should override the boardid */
+	if (tag->information1[0] != '+')
+		return;
+
+	strncpy(nvram.name, &tag->information1[1], BOARDID_LEN);
+
+	printk(KERN_INFO "Overriding boardid with '%s'\n", nvram.name);
+}
+
 /*
  * early init callback, read nvram data from flash and checksum it
  */
@@ -766,6 +793,11 @@ void __init board_prom_init(void)
 		return;
 	}
 
+	if (strcmp(cfe_version, "unknown") != 0) {
+		/* cfe present */
+		boardid_fixup(boot_addr);
+	}
+
 	/* find board by name */
 	for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
 		if (strncmp(nvram.name, bcm963xx_boards[i]->name,
