diff --git a/src/northsouthbridge/sis/550/ipl.S b/src/northsouthbridge/sis/550/ipl.S
index c87e049615..d8c7578878 100644
--- a/src/northsouthbridge/sis/550/ipl.S
+++ b/src/northsouthbridge/sis/550/ipl.S
@@ -366,11 +366,15 @@ spl_vector:
 	.byte	0xea				# jmp to 8000:0000, where SPL
 	.word	0x0000, SPL_RAM_SEG		# (LinuxBIOS) starts in RAM
 
+#ifdef STD_FLASH
+	.org 0xffff
+#else /* !STD_FLASH i.e. DoC Mil */
 #if (USE_DOC_MIL == 1)
 	.org 0x1ff
 #elif (USE_DOC_2000_TSOP == 1) || (USE_DOC_MIL_PLUS == 1)
 	.org 0x3ff
 #endif
+#endif
 
 end:
 	hlt
diff --git a/src/northsouthbridge/sis/550/southbridge.c b/src/northsouthbridge/sis/550/southbridge.c
index 2906227b52..a3e4606e9b 100644
--- a/src/northsouthbridge/sis/550/southbridge.c
+++ b/src/northsouthbridge/sis/550/southbridge.c
@@ -145,7 +145,6 @@ void nvram_on()
 	}
 	printk_debug("Now try to turn off shadow\n");
 
-#if !defined(STD_FLASH)
 	/* turn off nvram shadow in 0xc0000 ~ 0xfffff, i.e. accessing segment C - F
 	   is actually to the DRAM not NVRAM. For 512KB NVRAM case, this one should be
 	   disabled */
@@ -163,7 +162,6 @@ void nvram_on()
 		printk_debug("Shadow memory disabled in SiS 550\n");
 
 	}
-#endif
 }
 
 /* serial_irq_fixup: Enable Serial Interrupt. Serial interrupt is the IRQ line from SiS 950