diff --git a/kernel/busses/Module.mk b/kernel/busses/Module.mk
index 778d50f3..991c079f 100644
--- a/kernel/busses/Module.mk
+++ b/kernel/busses/Module.mk
@@ -29,10 +29,13 @@ ifeq ($(shell if grep -q '^CONFIG_IPMI_HANDLER=' $(LINUX)/.config; then echo 1;
 KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ipmb.o
 KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ipmi.o
 endif
-KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis630.o
-KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis645.o
-
 # These targets ARE included in 'mkpatch' ...
+ifneq ($(shell if grep -q '^CONFIG_I2C_SIS630=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis630.o
+endif
+ifneq ($(shell if grep -q '^CONFIG_I2C_SIS645=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis645.o
+endif
 ifneq ($(shell if grep -q '^CONFIG_I2C_ALI1535=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ali1535.o
 endif
diff --git a/mkpatch/FILES b/mkpatch/FILES
index e1d173e4..c198175a 100644
--- a/mkpatch/FILES
+++ b/mkpatch/FILES
@@ -15,6 +15,8 @@ kernel/busses/i2c-tsunami.c	drivers/i2c/i2c-tsunami.c
 kernel/busses/i2c-via.c		drivers/i2c/i2c-via.c
 kernel/busses/i2c-viapro.c	drivers/i2c/i2c-viapro.c
 kernel/busses/i2c-voodoo3.c	drivers/i2c/i2c-voodoo3.c
+kernel/busses/i2c-sis630.c	drivers/i2c/i2c-sis630.c
+kernel/busses/i2c-sis645.c	drivers/i2c/i2c-sis645.c
 kernel/sensors.c		drivers/sensors/sensors.c
 kernel/chips/adm1021.c		drivers/sensors/adm1021.c
 kernel/chips/adm1024.c		drivers/sensors/adm1024.c
diff --git a/mkpatch/mkpatch.pl b/mkpatch/mkpatch.pl
index f294242b..0e1c248c 100755
--- a/mkpatch/mkpatch.pl
+++ b/mkpatch/mkpatch.pl
@@ -189,6 +189,18 @@ CONFIG_I2C_SIS5595
   built as a module which can be inserted and removed while the kernel
   is running.
 
+Silicon Integrated Systems Corp. SiS630/730 based Mainboard
+CONFIG_I2C_SIS630
+  If you say yes to this option, support will be included for the SiS 630
+  and 730 mainboard I2C interfaces. This can also be built as a module 
+  which can be inserted and removed while the kernel is running.
+
+Silicon Integrated Systems Corp. SiS645/961,645DX/961,735 based Mainboard
+CONFIG_I2C_SIS645
+  If you say yes to this option, support will be included for the SiS 645/961,
+  645DX/961 and 735 mainboard I2C interfaces. This can also be built as a module
+  which can be inserted and removed while the kernel is running.
+
 VIA Technologies, Inc. VT82C586B
 CONFIG_I2C_VIA
   If you say yes to this option, support will be included for the VIA
@@ -235,7 +247,7 @@ Analog Devices ADM1021 and compatibles
 CONFIG_SENSORS_ADM1021 
   If you say yes here you get support for Analog Devices ADM1021 
   and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A,
-  Genesys Logic GL523SM, National Semi LM84, TI THMC10,
+  Genesys Logic GL523SM, National Semi LM84, TI THMC10, Onsemi MC1066
   and the XEON processor built-in sensor. This can also 
   be built as a module which can be inserted and removed while the 
   kernel is running.
@@ -794,6 +806,8 @@ sub gen_drivers_i2c_Config_in
     dep_tristate '  Intel i810AA/AB/E and i815' CONFIG_I2C_I810 $CONFIG_I2C_ALGOBIT
     dep_tristate '  Intel 82371AB PIIX4(E), 443MX, ServerWorks OSB4/CSB5, SMSC Victory66' CONFIG_I2C_PIIX4 $CONFIG_I2C
     dep_tristate '  SiS 5595' CONFIG_I2C_SIS5595 $CONFIG_I2C
+    dep_tristate '  SiS 630/730' CONFIG_I2C_SIS630 $CONFIG_I2C
+    dep_tristate '  SiS 645/961,645DX/961,735' CONFIG_I2C_SIS645 $CONFIG_I2C $CONFIG_HOTPLUG
     dep_tristate '  Savage 4' CONFIG_I2C_SAVAGE4 $CONFIG_I2C_ALGOBIT
     dep_tristate '  VIA Technologies, Inc. VT82C586B' CONFIG_I2C_VIA $CONFIG_I2C_ALGOBIT
     dep_tristate '  VIA Technologies, Inc. VT596A/B, 686A/B, 8231, 8233, 8233A, 8235' CONFIG_I2C_VIAPRO $CONFIG_I2C
@@ -1164,6 +1178,8 @@ obj-$(CONFIG_I2C_I810)			+= i2c-i810.o
 obj-$(CONFIG_I2C_ISA)			+= i2c-isa.o
 obj-$(CONFIG_I2C_PIIX4)			+= i2c-piix4.o dmi_scan.o
 obj-$(CONFIG_I2C_SIS5595)		+= i2c-sis5595.o
+obj-$(CONFIG_I2C_SIS630)		+= i2c-sis630.o
+obj-$(CONFIG_I2C_SIS645)		+= i2c-sis645.o
 obj-$(CONFIG_I2C_SAVAGE4)		+= i2c-savage4.o
 obj-$(CONFIG_I2C_TSUNAMI)		+= i2c-tsunami.o
 obj-$(CONFIG_I2C_VIA)			+= i2c-via.o
@@ -1245,6 +1261,22 @@ else
   endif
 endif
 
+ifeq ($(CONFIG_I2C_SIS630),y)
+  L_OBJS += i2c-sis630.o
+else 
+  ifeq ($(CONFIG_I2C_SIS630),m)
+    M_OBJS += i2c-sis630.o
+  endif
+endif
+
+ifeq ($(CONFIG_I2C_SIS645),y)
+  L_OBJS += i2c-sis645.o
+else 
+  ifeq ($(CONFIG_I2C_SIS645),m)
+    M_OBJS += i2c-sis645.o
+  endif
+endif
+
 ifeq ($(CONFIG_I2C_SAVAGE4),y)
   L_OBJS += i2c-savage4.o
 else 
@@ -1349,6 +1381,12 @@ sub gen_drivers_i2c_i2c_core_c
 #ifdef CONFIG_I2C_SIS5595
 	extern int i2c_sis5595_init(void);
 #endif
+#ifdef CONFIG_I2C_SIS630
+	extern int i2c_sis630_init(void);
+#endif
+#ifdef CONFIG_I2C_SIS645
+	extern int sis645_init(void);
+#endif
 #ifdef CONFIG_I2C_SAVAGE4
 	extern int i2c_savage4_init(void);
 #endif
@@ -1391,6 +1429,12 @@ EOF
 #ifdef CONFIG_I2C_SIS5595
 	i2c_sis5595_init();
 #endif
+#ifdef CONFIG_I2C_SIS630
+	i2c_sis630_init();
+#endif
+#ifdef CONFIG_I2C_SIS645
+	sis645_init();
+#endif
 #ifdef CONFIG_I2C_SAVAGE4
 	i2c_savage4_init();
 #endif