diff --git a/lm_sensors-3.1.1-no-ipmisensors-driver.patch b/lm_sensors-3.1.1-no-ipmisensors-driver.patch
new file mode 100644
index 0000000..06bf618
--- /dev/null
+++ b/lm_sensors-3.1.1-no-ipmisensors-driver.patch
@@ -0,0 +1,40 @@
+From: Jean Delvare <jdelvare@suse.de>
+Subject: Don't point the user to the ipmisensors driver
+References: bnc#558756
+
+We do not ship the out-of-tree ipmisensors driver, so do not point
+the user to that driver.
+
+--- lm_sensors-3.1.1.orig/prog/detect/sensors-detect
++++ lm_sensors-3.1.1/prog/detect/sensors-detect
+@@ -1121,12 +1121,12 @@ use vars qw(@i2c_adapter_names);
+ @ipmi_ifs = (
+ 	{
+ 		name => "IPMI BMC KCS",
+-		driver => "ipmisensors",
++		driver => "to-be-written",
+ 		isa_addrs => [0x0ca0],
+ 		isa_detect => sub { ipmi_detect(@_); },
+ 	}, {
+ 		name => "IPMI BMC SMIC",
+-		driver => "ipmisensors",
++		driver => "to-be-written",
+ 		isa_addrs => [0x0ca8],
+ 		isa_detect => sub { ipmi_detect(@_); },
+ 	}
+@@ -5127,13 +5127,13 @@ sub ipmi_from_smbios
+ 						 $if->{type}));
+ 		}
+ 		print "Success!\n".
+-		      "    (confidence 8, driver `ipmisensors')\n";
++		      "    (confidence 8, driver `to-be-written')\n";
+ 		my $new_hash = {
+ 			conf => 8,
+ 			isa_addr => $if->{addr} || 0,
+ 			chipname => $if->{type},
+ 		};
+-		add_isa_to_chips_detected("ipmisensors", $new_hash);
++		add_isa_to_chips_detected("to-be-written", $new_hash);
+ 	}
+ 
+ 	return scalar @ipmi_if;
diff --git a/sensors.changes b/sensors.changes
index 4ac1c34..ec63217 100644
--- a/sensors.changes
+++ b/sensors.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec  4 11:22:01 CET 2009 - jdelvare@suse.de
+
+- lm_sensors-3.1.1-no-ipmisensors-driver: Do not point the user to
+  the ipmisensors driver which we do not ship (bnc#558756).
+
 -------------------------------------------------------------------
 Wed Oct 28 16:49:32 UTC 2009 - crrodriguez@opensuse.org
 
diff --git a/sensors.spec b/sensors.spec
index 57a7d1c..7201386 100644
--- a/sensors.spec
+++ b/sensors.spec
@@ -22,9 +22,9 @@ Name:           sensors
 BuildRequires:  bison flex rrdtool-devel
 Url:            http://www.lm-sensors.org/
 Version:        3.1.1
-Release:        3
+Release:        4
 Summary:        Hardware health monitoring for Linux
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          System/Monitoring
 Requires:       modules
 AutoReqProv:    on
@@ -37,6 +37,7 @@ Patch4:         lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
 Patch5:         lm_sensors-r5757-LPC47M233-not-supported.patch
 Patch6:         lm_sensors-r5760-rename-modprobe-conf.patch
 Patch7:         lm_sensors-r5770-fancontrol-update.patch
+Patch8:         lm_sensors-3.1.1-no-ipmisensors-driver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390 s390x
 
@@ -62,7 +63,7 @@ Authors:
     Geert Uytterhoeven <geert@linux-m68k.org>
 
 %package -n sensord
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Hardware health monitoring daemon
 Group:          System/Monitoring
 Provides:       sensors:/usr/sbin/sensord
@@ -82,7 +83,7 @@ Authors:
     Merlin Hughes <merlin@merlin.org>
 
 %package -n libsensors4
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Hardware health monitoring library
 Group:          System/Libraries
 AutoReqProv:    on
@@ -106,7 +107,7 @@ Authors:
     Mark M. Hoffman    <mhoffman@lightlink.com>
 
 %package -n libsensors4-devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Hardware health monitoring library
 Group:          Development/Libraries/C and C++
 Requires:       libsensors4 = %{version} glibc-devel
@@ -141,6 +142,7 @@ Authors:
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS"