diff --git a/src/northsouthbridge/sis/630/Config b/src/northsouthbridge/sis/630/Config
index 6607071827..4225da1a11 100644
--- a/src/northsouthbridge/sis/630/Config
+++ b/src/northsouthbridge/sis/630/Config
@@ -1,2 +1,8 @@
+option SIS630
+option USE_DOC_MIL
+option INBUF_COPY
+docipl northsouthbridge/sis/630/ipl.S
+raminit northsouthbridge/sis/630/raminit.inc
+
 object southbridge.o
 object northbridge.o
diff --git a/util/config/winfast.config b/util/config/winfast.config
index 11b5483ca0..4f62e73054 100644
--- a/util/config/winfast.config
+++ b/util/config/winfast.config
@@ -3,29 +3,15 @@
 # This will make a target directory of ./winfast
 target winfast 
 
-# Add -DSIS630 in Makefile to enable SIS630 specific feature
-# Fixme: -DSIS630 should be determined from target or mainboard
-option SIS630
-
 # WinFast 6300 MAX mainboard
 mainboard leadtek/winfast6300
 
 # Enable Serial Console for debugging
 option SERIAL_CONSOLE
 
-# Use DoC Millennium as our storage device
-option USE_DOC_MIL
-option INBUF_COPY
-
-# Fixme: when docipl is issued the -DUSE_DOC_MIL and
-# -DINBUF_COPY should be issued automatically.
-docipl northsouthbridge/sis/630
-
 # Use the internal VGA frame buffer device
 # Fixme: this does not effect the Makefile rules for docipl
 option HAVE_FRAMEBUFFER
 
-# we have to figure a better way than this!
-raminit northsouthbridge/sis/630/raminit.inc
 linux /usr/src/linux