diff --git a/src/mainboard/leadtek/winfast6300/dll.inc b/src/mainboard/leadtek/winfast6300/dll.inc
index 7792b453e1..ed7f38e391 100644
--- a/src/mainboard/leadtek/winfast6300/dll.inc
+++ b/src/mainboard/leadtek/winfast6300/dll.inc
@@ -2,12 +2,12 @@
    register values are very Mainboard specific */
 
 #		Reg.	Value
+#ifndef SIS630S
 	.byte	0x8c,	0x66
 	.byte	0x8d,	0x66
 	.byte	0x8e,	0x03
 	.byte	0x8f,	0x55
-
-#ifdef SIS630S
+#else /* SIS630S */
         .byte	0x8c,	0x27	# set Clock DLL control register
         .byte	0x8d,	0x77	# 0x8c ~ 0x8f,
         .byte	0x8e,	0x01	# these values are very M/B
diff --git a/src/northsouthbridge/sis/630/southbridge.c b/src/northsouthbridge/sis/630/southbridge.c
index 8d51710396..e8ebf4aff9 100644
--- a/src/northsouthbridge/sis/630/southbridge.c
+++ b/src/northsouthbridge/sis/630/southbridge.c
@@ -70,35 +70,11 @@ void nvram_on()
 #endif
 }
 
-// simple fixup (which we hope can leave soon) for the sis southbridge part
-void
-final_southbridge_fixup()
+static void
+acpi_fixup(void)
 {
 	struct pci_dev *pcidev;
 
-#ifdef OLD_KERNEL_HACK
-	// ethernet fixup. This should all work, and doesn't, yet. 
-	// so we hack it for now. 
-	// need a manifest constant for the enet device. 
-	pcidev = pci_find_device(PCI_VENDOR_ID_SI, 0x0900, (void *)NULL);
-	if (pcidev != NULL) {
-		u32 bar0 = 0xb001;
-		// set the BAR 0 to 0xb000. Safe, high value, known good. 
-		// pci config set doesn't work for reasons we don't understand. 
-		pci_write_config_dword(pcidev, PCI_BASE_ADDRESS_0, bar0);
-
-		// Make sure bus mastering is on. The tried-and-true probe in linuxpci.c 
-		// doesn't set this for some reason. 
-		pci_write_config_byte(pcidev, PCI_COMMAND, 
-				      PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
-
-		// set the interrupt to 'b'
-		pci_write_config_byte(pcidev, PCI_INTERRUPT_LINE, 0xb);
-	} else {
-		printk(KERN_ERR "Can't find ethernet interface\n");
-	}
-
-	// fix up southbridge interrupt enables. 
 	pcidev = pci_find_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503, (void *)NULL);
 	if (pcidev != NULL) {
 		unsigned char val;
@@ -165,7 +141,39 @@ final_southbridge_fixup()
 	} else {
 		printk(KERN_EMERG "Can't find south bridge!\n");
 	}
+	
+}
+
+// simple fixup (which we hope can leave soon) for the sis southbridge part
+void
+final_southbridge_fixup()
+{
+	struct pci_dev *pcidev;
+
+#ifdef OLD_KERNEL_HACK
+	// ethernet fixup. This should all work, and doesn't, yet. 
+	// so we hack it for now. 
+	// need a manifest constant for the enet device. 
+	pcidev = pci_find_device(PCI_VENDOR_ID_SI, 0x0900, (void *)NULL);
+	if (pcidev != NULL) {
+		u32 bar0 = 0xb001;
+		// set the BAR 0 to 0xb000. Safe, high value, known good. 
+		// pci config set doesn't work for reasons we don't understand. 
+		pci_write_config_dword(pcidev, PCI_BASE_ADDRESS_0, bar0);
+
+		// Make sure bus mastering is on. The tried-and-true probe in linuxpci.c 
+		// doesn't set this for some reason. 
+		pci_write_config_byte(pcidev, PCI_COMMAND, 
+				      PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
+
+		// set the interrupt to 'b'
+		pci_write_config_byte(pcidev, PCI_INTERRUPT_LINE, 0xb);
+	} else {
+		printk(KERN_ERR "Can't find ethernet interface\n");
+	}
 #endif /* OLD_KERNEL_HACK */
 
+	acpi_fixup();
+
 	printk(KERN_INFO "Southbridge fixup done for SIS 503\n");
 }