Index: /src/router/services/sysinit/sysinit-broadcom.c
===================================================================
--- /src/router/services/sysinit/sysinit-broadcom.c (revision 12424)
+++ /src/router/services/sysinit/sysinit-broadcom.c (revision 12427)
@@ -920,4 +920,5 @@
 		nvram_set("pci/1/2/boardflags2", "0x0602");
 
+		if (!nvram_match ("bootnv_ver", "6")) {
 		if (startswith(nvram_safe_get("pci/1/1/macaddr"), "00:90:4C")
 		    || startswith(nvram_safe_get("pci/1/2/macaddr"),
@@ -931,4 +932,5 @@
 			nvram_set("pci/1/2/macaddr", mac);
 			need_reboot = 1;
+		}
 		}
 		break;