diff --git a/CHANGES b/CHANGES
index 8db01e22..b48b38de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,10 +20,11 @@ ask CVS about it:
   Library: Fix bmcsensors scaling, increase number of sensors;
            Add w83627thf support; Advance version to 2.0.2
   Makefiles: Install burntest, fancontrol, pwmconfig, decode-*.pl
-  Module i2c-sis630: sync with 2.6.0-X driver version. 
   Module bmcsensors: Fix voltage scaling, voltage and fan limits
+  Module i2c-piix4: Add support for CSB6
+  Module i2c-sis630: sync with 2.6.0-X driver version. 
   Program sensors-detect: Prefer Super I/O drivers;
-                          Fix w83627hf detection
+                          Fix w83627hf detection; detect CSB6
 
 
 2.8.1 (20031005)
diff --git a/kernel/busses/i2c-piix4.c b/kernel/busses/i2c-piix4.c
index c24b84ce..3a59c913 100644
--- a/kernel/busses/i2c-piix4.c
+++ b/kernel/busses/i2c-piix4.c
@@ -22,7 +22,7 @@
 /*
    Supports:
 	Intel PIIX4, 440MX
-	Serverworks OSB4, CSB5
+	Serverworks OSB4, CSB5, CSB6
 	SMSC Victory66
 
    Note: we assume there can only be one device, with one SMBus interface.
@@ -447,6 +447,10 @@ static struct i2c_adapter piix4_adapter = {
 	.algo		= &smbus_algorithm,
 };
 
+#ifndef PCI_DEVICE_ID_SERVERWORKS_CSB6
+#define PCI_DEVICE_ID_SERVERWORKS_CSB6 0x0203
+#endif
+
 static struct pci_device_id piix4_ids[] __devinitdata = {
 	{
 		.vendor =	PCI_VENDOR_ID_INTEL,
@@ -469,6 +473,13 @@ static struct pci_device_id piix4_ids[] __devinitdata = {
 		.subdevice =	PCI_ANY_ID,
 		.driver_data =	0,
 	},
+	{
+		.vendor =	PCI_VENDOR_ID_SERVERWORKS,
+		.device =	PCI_DEVICE_ID_SERVERWORKS_CSB6,
+		.subvendor =	PCI_ANY_ID,
+		.subdevice =	PCI_ANY_ID,
+		.driver_data =	0,
+	},
 	{
 		.vendor =	PCI_VENDOR_ID_INTEL,
 		.device =	PCI_DEVICE_ID_INTEL_82443MX_3,
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index ffb919ce..3020f428 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -676,6 +676,14 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        driver => "i2c-piix4",
        match => sub { $_[0] =~ /^SMBus PIIX4 adapter at / },
      } , 
+     { 
+       vendid => 0x1166,
+       devid  => 0x0203,
+       func => 0,
+       procid => "ServerWorks CSB6 South Bridge",
+       driver => "i2c-piix4",
+       match => sub { $_[0] =~ /^SMBus PIIX4 adapter at / },
+     } , 
      { 
        vendid => 0x1283,
        devid  => 0x8172,