diff --git a/src/mainboard/tyan/guiness/Config b/src/mainboard/tyan/guiness/Config
index 58f04ec4fa..8cf452346d 100644
--- a/src/mainboard/tyan/guiness/Config
+++ b/src/mainboard/tyan/guiness/Config
@@ -210,7 +210,7 @@ option FINAL_MAINBOARD_FIXUP=1
 ## This is useful for optional includes
 ##
 option USE_FALLBACK_IMAGE=0
-expr USE_NORMAL_IMAGE=!USE_FALLBACK_IMAGE
+expr BUILD_NORMAL_IMAGE=!USE_FALLBACK_IMAGE
 
 ###
 ### LinuxBIOS layout values
@@ -241,8 +241,8 @@ expr USE_OPTION_TABLE=!USE_FALLBACK_IMAGE
 ## Compute the location and size of where this firmware image
 ## (linuxBIOS plus bootloader) will live in the boot rom chip.
 ##
-expr ROM_SECTION_SIZE  =(USE_FALLBACK_IMAGE*65536)+(USE_NORMAL_IMAGE*(ROM_SIZE - 65536))
-expr ROM_SECTION_OFFSET=(USE_FALLBACK_IMAGE*(ROM_SIZE-65536))+(USE_NORMAL_IMAGE*0)
+expr ROM_SECTION_SIZE  =(USE_FALLBACK_IMAGE*65536)+(BUILD_NORMAL_IMAGE*(ROM_SIZE - 65536))
+expr ROM_SECTION_OFFSET=(USE_FALLBACK_IMAGE*(ROM_SIZE-65536))+(BUILD_NORMAL_IMAGE*0)
 
 ##
 ## Compute the start location and size size of
@@ -257,7 +257,7 @@ expr PAYLOAD_SIZE  =ROM_SECTION_SIZE - ROM_IMAGE_SIZE
 ## Compute where this copy of linuxBIOS will start in the boot rom
 ##
 #expr _ROMBASE      =ZKERNEL_START + PAYLOAD_SIZE
-expr _ROMBASE = 0xffff0000 - ( 0x10000 * USE_NORMAL_IMAGE)
+expr _ROMBASE = 0xffff0000 - ( 0x10000 * BUILD_NORMAL_IMAGE)
 
 
 ##
diff --git a/src/mainboard/tyan/guiness/STATUS b/src/mainboard/tyan/guiness/STATUS
index 5357d43527..d64664bf92 100644
--- a/src/mainboard/tyan/guiness/STATUS
+++ b/src/mainboard/tyan/guiness/STATUS
@@ -19,9 +19,9 @@ console-types: serial
 # vga is unsupported, unstable, or stable
 vga: unsupported
 # Last-known-good follows the internationl date standard: day/month/year
-last-known-good: 19/12/2002
+last-known-good: 07/01/2003
 Comments: 
 Links:
 Mainboard-revision: 
 # What other mainboards are like this one? List them here. 
-AKA: 
+AKA: Tyan ThunderK7 Tyan TigerMP
diff --git a/src/mainboard/tyan/guiness/example-normal.config b/src/mainboard/tyan/guiness/example-normal.config
index 143ba703a1..475ae0672c 100644
--- a/src/mainboard/tyan/guiness/example-normal.config
+++ b/src/mainboard/tyan/guiness/example-normal.config
@@ -5,7 +5,8 @@ target ./tdir/normal
 mainboard tyan/guiness
 
 ## Build a normal not a fallback image.
-option USE_FALLBACK_IMAGE=0
+#option USE_FALLBACK_IMAGE=0
+option USE_NORMAL_IMAGE
 
 ## Build an image for a 512KB rom
 ## ./normal/romimage is the entire rom image except for the last 64KB
diff --git a/src/southbridge/amd/amd766/cmos_boot_failover.inc b/src/southbridge/amd/amd766/cmos_boot_failover.inc
index 6a606bb6a8..04575ac7cf 100644
--- a/src/southbridge/amd/amd766/cmos_boot_failover.inc
+++ b/src/southbridge/amd/amd766/cmos_boot_failover.inc
@@ -68,6 +68,7 @@
 	movb	%al, %bl
 
 	/* Now finally test the checksum */
+	xorw	$0xffff, %cx
 	cmpw	%cx, %bx
 	je	__rtc_ok