diff --git a/CHANGES b/CHANGES
index 4b5cdfb3..956b0836 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ SVN HEAD
   Man page i2cdetect.8: Describe the output convention
   Man page sensors.1: Update (option -c) and clean up
   Module bmcsensors: Fix several warnings
+                     Fix fragile structure initialization
   Module i2c-i801: Add ICH9 support
   Module f71805f: Fix the device address decoding (2.6 backport)
   Module icspll: Delete. It was useless and dangerous.
diff --git a/kernel/chips/bmcsensors.c b/kernel/chips/bmcsensors.c
index 12dc858e..16b963d7 100644
--- a/kernel/chips/bmcsensors.c
+++ b/kernel/chips/bmcsensors.c
@@ -84,15 +84,11 @@ static struct i2c_driver bmcsensors_driver = {
 };
 
 static struct bmcsensors_data bmc_data;
-struct i2c_client bmc_client = {
-	"BMC Sensors",
-	1,                  /* fake should be 0 */
-	0,
-	0,
-	NULL,   /* adapter */
-	&bmcsensors_driver,
-	& bmc_data,
-	0
+static struct i2c_client bmc_client = {
+	.name		= "BMC Sensors",
+	.id		= 1,                  /* fake should be 0 */
+	.driver		= &bmcsensors_driver,
+	.data		= &bmc_data,
 };
 
 static int bmcsensors_initialized;