diff --git a/lirc-0.8.3-hw_i2cuser_header.diff b/lirc-0.8.3-hw_i2cuser_header.diff
new file mode 100644
index 0000000..afcaa64
--- /dev/null
+++ b/lirc-0.8.3-hw_i2cuser_header.diff
@@ -0,0 +1,16 @@
+Index: lirc-0.8.3/daemons/hw_i2cuser.c
+===================================================================
+--- lirc-0.8.3.orig/daemons/hw_i2cuser.c
++++ lirc-0.8.3/daemons/hw_i2cuser.c
+@@ -52,8 +52,10 @@
+ #include <dirent.h>
+ #include <time.h>
+ #include <signal.h>
+-#include <linux/i2c.h>
+ #include <linux/i2c-dev.h>
++#ifndef I2C_SLAVE /* hack */
++#include <linux/i2c.h>
++#endif
+ 
+ #include "hardware.h"
+ #include "ir_remote.h"
diff --git a/lirc-kernel.spec b/lirc-kernel.spec
index 5c82d41..61081f7 100644
--- a/lirc-kernel.spec
+++ b/lirc-kernel.spec
@@ -18,7 +18,7 @@ License:        GPL v2 or later
 Group:          System/Kernel
 Summary:        LIRC kernel modules
 Version:        0.8.3
-Release:        2
+Release:        3
 Source0:        lirc-%{version}.tar.bz2
 Source1:        Makefile.module
 Source2:        Makefile.modsub
diff --git a/lirc.changes b/lirc.changes
index c8a847f..d6fd143 100644
--- a/lirc.changes
+++ b/lirc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 26 09:03:24 CEST 2008 - lnussel@suse.de
+
+- fix build of hw_i2cuser on 11.0+ (bnc#387587)
+
 -------------------------------------------------------------------
 Wed May  7 10:39:56 CEST 2008 - lnussel@suse.de
 
diff --git a/lirc.spec b/lirc.spec
index 2fa4aed..36625aa 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,10 +14,20 @@
 Name:           lirc
 BuildRequires:  alsa-devel xorg-x11-devel
 # for hw_atilibusb driver
+%if 0%suse_version > 1020
 BuildRequires:  libusb-devel
+%else
+BuildRequires:  libusb
+%endif
 # for hw_i2cuser driver
+%if 0%suse_version > 1010
 BuildRequires:  linux-kernel-headers
-%if %suse_version > 1020
+%if 0%suse_version > 1030
+# i2c-dev.h now moved to that package
+BuildRequires:  i2c-tools
+%endif
+%endif
+%if 0%suse_version > 1020
 BuildRequires:  fdupes
 %endif
 Url:            http://www.lirc.org/
@@ -25,7 +35,7 @@ License:        GPL v2 or later
 Group:          Hardware/Other
 AutoReqProv:    on
 Version:        0.8.3
-Release:        2
+Release:        11
 PreReq:         %fillup_prereq %insserv_prereq
 Summary:        Tools for Infrared Receivers
 Source0:        lirc-0.8.3.tar.bz2
@@ -39,10 +49,12 @@ Source9:        51-lirc.rules
 Patch1:         lirc-sockets-in-var.diff
 Patch2:         imon2_conf.patch
 Patch3:         lirc-0.8.3-hw_i2cuser.diff
+Patch4:         lirc-0.8.3-hw_i2cuser_header.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       udev
 Suggests:       lirc-kmp
 Provides:       lirc-devel
+Supplements:    lirc-kmp
 
 %description
 LIRC is a package that supports receiving and sending IR signals with
@@ -59,11 +71,16 @@ control your computer with a remote control.
 %patch1 -p1 -b .var
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 cp %{SOURCE8} .
 #find . -type d -name CVS -print0 | xargs -0 -- rm -rf
 #find . -name .cvsignore  -print0 | xargs -0 -- rm -rf
 
 %build
+%if 0%suse_version < 1020
+# XXX: hw_i2cuser doesn't build on sles10
+sed -i -e 's/linux\/i2c-dev\.h/foobarblah.h/' configure.ac
+%endif
 %{?suse_update_config:%{suse_update_config -fl}}
 autoreconf -vfi
 CFLAGS="%{optflags}" ./configure \
@@ -114,7 +131,7 @@ rm -f %{buildroot}%{_libdir}/liblirc_client.la
 #
 # get rid of useless contrib stuff
 rm contrib/lirc.*
-%if %suse_version > 1020
+%if 0%suse_version > 1020
 %fdupes $RPM_BUILD_ROOT
 %endif
 #
@@ -161,6 +178,8 @@ install -D -m 644 /dev/null %{buildroot}/etc/lircd.conf
 rm -rf %{buildroot}
 
 %changelog
+* Thu Jun 26 2008 lnussel@suse.de
+- fix build of hw_i2cuser on 11.0+ (bnc#387587)
 * Wed May 07 2008 lnussel@suse.de
 - fix build
 - BuildRequire linux-kernel-headers and libusb-devel to enable