diff --git a/romimages/RON_WINFAST6300/Makefile b/romimages/RON_WINFAST6300/Makefile
index 7f95aca669..9e5f27746d 100644
--- a/romimages/RON_WINFAST6300/Makefile
+++ b/romimages/RON_WINFAST6300/Makefile
@@ -19,7 +19,7 @@ CFLAGS=$(INCLUDES) -O2 $(CPUFLAGS) -Ilinux/include -Wall
 
 OBJECTS=crt0.o hardwaremain.o linuxbiosmain.o 
 OBJECTS += mainboard.o mtrr.o subr.o fill_inbuf.o params.o
-OBJECTS += southbridge.o northbridge.o
+OBJECTS += southbridge.o northbridge.o superio.o
 #OBJECTS += pci.o
 OBJECTS += printk.o vsprintf.o
 OBJECTS += newpci.o linuxpci.o
@@ -95,6 +95,9 @@ southbridge.o: $(TOP)/src/northsouthbridge/sis/630/southbridge.c
 northbridge.o: $(TOP)/src/northsouthbridge/sis/630/northbridge.c
 	cc $(CFLAGS) -c $<
 
+superio.o: $(TOP)/src/superio/sis/950/superio.c
+	cc $(CFLAGS) -c $<
+
 pci.o:  $(TOP)/src/lib/pci.c
 	cc $(CFLAGS) -c $<
 
diff --git a/src/mainboard/leadtek/winfast6300/mainboard.c b/src/mainboard/leadtek/winfast6300/mainboard.c
index 322593e3dc..7e27fd8753 100644
--- a/src/mainboard/leadtek/winfast6300/mainboard.c
+++ b/src/mainboard/leadtek/winfast6300/mainboard.c
@@ -9,6 +9,12 @@ void
 final_mainboard_fixup(void)
 {
     void final_southbridge_fixup(void);
+    void final_superio_fixup(void);
+
     final_southbridge_fixup();
-    printk(KERN_INFO "Final mainboard fixup done for Winfast 6300 (and similar)\n");
+    final_superio_fixup();
+
+    printk(KERN_INFO 
+	"Final mainboard fixup done for Winfast 6300 (and similar)\n");
+
 }
diff --git a/src/northsouthbridge/sis/630/southbridge.c b/src/northsouthbridge/sis/630/southbridge.c
index 5ca5e71cb0..cd87312e16 100644
--- a/src/northsouthbridge/sis/630/southbridge.c
+++ b/src/northsouthbridge/sis/630/southbridge.c
@@ -57,28 +57,6 @@ void nvram_on()
 		pci_write_config_word(pcidev, 0x72, 0x1fff);
 	}
 }
-/* turn on the floppy. On some chipsets you have to do this. */
-#ifdef MUST_ENABLE_FLOPPY
-void enable_floppy()
-{
-	/* unlock it XXX make this a subr at some point */
-	outb(0x87, 0x2e);
-	outb(0x01, 0x2e);
-	outb(0x55, 0x2e);
-	outb(0x55, 0x2e);
-
-	/* now set the LDN to floppy LDN */
-	outb(0x7, 0x2e);	/* pick reg. 7 */
-	outb(0x0, 0x2f);	/* LDN 0 to reg. 7 */
-
-	/* now select register 0x30, and set bit 1 in that register */
-	outb(0x30, 0x2e);
-	outb(0x1, 0x2f);
-
-	/* all done. */
-	outb(1, 0x2e);
-}
-#endif /* MUST_ENABLE_FLOPPY */
 
 // simple fixup (which we hope can leave soon) for the sis southbridge part
 void