diff --git a/lirc-kernel.spec b/lirc-kernel.spec
index 2b5c022..2dc374c 100644
--- a/lirc-kernel.spec
+++ b/lirc-kernel.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package lirc-kernel (Version 0.8.2)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,13 +11,14 @@
 # norootforbuild
 # icecream 0
 
+
 Name:           lirc-kernel
 BuildRequires:  kernel-source kernel-syms module-init-tools
 License:        GPL v2 or later
 Group:          System/Kernel
 Summary:        LIRC kernel modules
 Version:        0.8.2
-Release:        3
+Release:        4
 Source0:        lirc-0.8.2.tar.bz2
 Source1:        Makefile.module
 Source2:        Makefile.modsub
@@ -82,13 +83,13 @@ for flavor in %flavors_to_build; do
 done
 
 %changelog
-* Tue Nov 27 2007 - ro@suse.de
+* Tue Nov 27 2007 ro@suse.de
 - fix build with 2.6.24
-* Thu Oct 18 2007 - ro@suse.de
+* Thu Oct 18 2007 ro@suse.de
 - fix build with 2.6.23
-* Fri Aug 10 2007 - lnussel@suse.de
+* Fri Aug 10 2007 lnussel@suse.de
 - upgrade to 0.8.2 final, just minor changes
-* Fri Jun 01 2007 - lnussel@suse.de
+* Fri Jun 01 2007 lnussel@suse.de
 - update to 0.8.2pre3:
   * added support for TechnoTrend USB IR receiver (Stefan Macher)
   * automatic release event generation in lircd
@@ -103,35 +104,35 @@ done
   * fixed show-stopper bug in RC-6 transmit code
   * added support for Kanam Accent (Niccolo Rigacci)
   * added support for SoundGraph iMON 2.4G DT & LT (Morten Bogeskov)
-* Fri Jun 01 2007 - lnussel@suse.de
+* Fri Jun 01 2007 lnussel@suse.de
 - disable lirc_gpio as it doesn't build with 2.6.22
-* Mon Apr 23 2007 - hvogel@suse.de
+* Mon Apr 23 2007 hvogel@suse.de
 - Added imon2 driver that is a copy of imon with the pad2key
   patch from M. Brakemeier
-* Wed Apr 04 2007 - lrupp@suse.de
+* Wed Apr 04 2007 lrupp@suse.de
 - added module-init-tools to BuildRequires
-* Tue Feb 27 2007 - ro@suse.de
+* Tue Feb 27 2007 ro@suse.de
 - specfile: lirc-kernel-KMP should be lirc-KMP
 - remove NoSource from specfile
-* Mon Jan 15 2007 - lnussel@suse.de
+* Mon Jan 15 2007 lnussel@suse.de
 - also build xen kernel module (#233999)
-* Fri Jan 12 2007 - lnussel@suse.de
+* Fri Jan 12 2007 lnussel@suse.de
 - fix kernel module build: SLAB_ATOMIC -> GFP_ATOMIC
-* Thu Jan 11 2007 - lnussel@suse.de
+* Thu Jan 11 2007 lnussel@suse.de
 - new version 0.8.1
   * added support for USB-UIRT
   * added transmitter support for new version of Windows Media
   Center transceiver
   * added support for Iguanaworks USB IR Transceiver
-* Mon Aug 21 2006 - ro@suse.de
+* Mon Aug 21 2006 ro@suse.de
 - fix build with 2.6.18 (from cvs)
-* Thu Feb 16 2006 - lnussel@suse.de
+* Thu Feb 16 2006 lnussel@suse.de
 - remove redundant vermagic line from igorplugusb as it apparently
   confuses some magic kernel package script
-* Wed Feb 08 2006 - agruen@suse.de
+* Wed Feb 08 2006 agruen@suse.de
 - Rename lirc-kernel-kmp-* to lirc-kmp-*.
-* Tue Feb 07 2006 - lnussel@suse.de
+* Tue Feb 07 2006 lnussel@suse.de
 - serial and sir fail on ppc, skip them
 - bt829, it87 and parallel fail on s390, skip them
-* Thu Feb 02 2006 - lnussel@suse.de
+* Thu Feb 02 2006 lnussel@suse.de
 - initial kernel module package
diff --git a/lirc.changes b/lirc.changes
index 2d47405..bb18ab7 100644
--- a/lirc.changes
+++ b/lirc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 21 23:10:52 CET 2008 - crrodriguez@suse.de
+
+- add missing insserv_prereq
+- add missing calls to restart_on_update and stop_on_removal macros 
+
 -------------------------------------------------------------------
 Fri Aug 10 15:06:50 CEST 2007 - lnussel@suse.de
 
diff --git a/lirc.spec b/lirc.spec
index a363614..60bbd6a 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package lirc (Version 0.8.2)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+
 Name:           lirc
 BuildRequires:  alsa-devel xorg-x11-devel
 %if %suse_version > 1020
@@ -20,8 +21,8 @@ License:        GPL v2 or later
 Group:          Hardware/Other
 AutoReqProv:    on
 Version:        0.8.2
-Release:        32
-PreReq:         %fillup_prereq
+Release:        52
+PreReq:         %fillup_prereq %insserv_prereq
 Summary:        Tools for Infrared Receivers
 Source0:        lirc-0.8.2.tar.bz2
 Source4:        rc.lirc
@@ -78,8 +79,6 @@ perl %{SOURCE6} remotes
 
 %install
 # lirc
-test "%{buildroot}" != "" -a "%{buildroot}" != "/" &&\
-	rm -rf "%{buildroot}"
 make -C daemons  DESTDIR=%{buildroot} install
 make -C tools    DESTDIR=%{buildroot} install
 make -C doc      DESTDIR=%{buildroot} install
@@ -143,23 +142,30 @@ install -D -m 644 /dev/null %{buildroot}/etc/lircd.conf
 %doc %_mandir/man8/*
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/lircd.conf
 
+%preun
+%stop_on_removal lirc
+
 %post
-%{fillup_and_insserv lirc}
 /sbin/ldconfig
+%{fillup_and_insserv lirc}
 
 %postun
-%{insserv_cleanup}
 /sbin/ldconfig
+%restart_on_update lirc
+%{insserv_cleanup}
 
 %clean
 rm -rf %{buildroot}
 
 %changelog
-* Fri Aug 10 2007 - lnussel@suse.de
+* Fri Feb 22 2008 crrodriguez@suse.de
+- add missing insserv_prereq
+- add missing calls to restart_on_update and stop_on_removal macros
+* Fri Aug 10 2007 lnussel@suse.de
 - upgrade to 0.8.2 final, just minor changes
-* Thu Jun 21 2007 - lnussel@suse.de
+* Thu Jun 21 2007 lnussel@suse.de
 - require $remote_fs in init script (#285548)
-* Fri Jun 01 2007 - lnussel@suse.de
+* Fri Jun 01 2007 lnussel@suse.de
 - update to 0.8.2pre3:
   * added support for TechnoTrend USB IR receiver (Stefan Macher)
   * automatic release event generation in lircd
@@ -174,7 +180,7 @@ rm -rf %{buildroot}
   * fixed show-stopper bug in RC-6 transmit code
   * added support for Kanam Accent (Niccolo Rigacci)
   * added support for SoundGraph iMON 2.4G DT & LT (Morten Bogeskov)
-* Thu May 31 2007 - lnussel@suse.de
+* Thu May 31 2007 lnussel@suse.de
 - don't install useless contrib stuff
 - add proper ldconfig and insserv calls
 - make initscript to automatically install
@@ -183,121 +189,121 @@ rm -rf %{buildroot}
 - add  /etc/lircd.conf as %%ghost
 - don't package /var/run/lirc/lircd
 - don't package all remotes to save space
-* Mon Apr 23 2007 - hvogel@suse.de
+* Mon Apr 23 2007 hvogel@suse.de
 - Add config for imon2 driver with missing keys and pad2key
   addidtion from M. Brakemeier
-* Tue Jan 16 2007 - lnussel@suse.de
+* Tue Jan 16 2007 lnussel@suse.de
 - use optflags
-* Thu Jan 11 2007 - lnussel@suse.de
+* Thu Jan 11 2007 lnussel@suse.de
 - new version 0.8.1
   * added support for USB-UIRT
   * added transmitter support for new version of Windows Media
   Center transceiver
   * added support for Iguanaworks USB IR Transceiver
-* Tue Nov 14 2006 - lnussel@suse.de
+* Tue Nov 14 2006 lnussel@suse.de
 - fix excessive logging in devinput driver, use syslog (#218286)
-* Fri Nov 10 2006 - ro@suse.de
+* Fri Nov 10 2006 ro@suse.de
 - fix docu permissions
-* Thu Aug 24 2006 - lnussel@suse.de
+* Thu Aug 24 2006 lnussel@suse.de
 - SYSFS{../name} is deprecated, use ATTRS{name} instead
-* Thu Aug 17 2006 - ro@suse.de
+* Fri Aug 18 2006 ro@suse.de
 - fix build with 2.6.18 (from cvs)
-* Tue Feb 07 2006 - lnussel@suse.de
+* Tue Feb 07 2006 lnussel@suse.de
 - remove CFT2000 config file as it contains a strange proprietary
   notice (#148744)
-* Thu Feb 02 2006 - lnussel@suse.de
+* Thu Feb 02 2006 lnussel@suse.de
 - update to version 0.8.0
   * included kernel modules build with minor modifications (#147601)
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Mon Jan 23 2006 - ro@suse.de
+* Mon Jan 23 2006 ro@suse.de
 - added (empty) rest of LSB init script header
-* Wed Nov 30 2005 - lnussel@suse.de
+* Wed Nov 30 2005 lnussel@suse.de
 - use different way for matching *IR* in 51-lirc.rules to get rid of
   udev.get_input_lirc.sh
-* Thu Sep 01 2005 - lnussel@suse.de
+* Thu Sep 01 2005 lnussel@suse.de
 - move lirc related udev stuff into lirc package (#114656)
 - improve checks for device presence in init script to avoid
   starting an unconfigured lircd that just silently quits later.
   (#106055)
 - remove dependencies from initscript to allow vdr to start earlier
-* Mon Aug 29 2005 - lnussel@suse.de
+* Mon Aug 29 2005 lnussel@suse.de
 - update input layer config file (#113852)
-* Tue Aug 16 2005 - lnussel@suse.de
+* Tue Aug 16 2005 lnussel@suse.de
 - don't fail if evdev is not available as module (#104558)
-* Wed Aug 10 2005 - kraxel@suse.de
+* Wed Aug 10 2005 kraxel@suse.de
 - fix quoting bug in init script (#102540).
-* Tue May 31 2005 - kraxel@suse.de
+* Tue May 31 2005 kraxel@suse.de
 - fix init script (#86271).
 - updfate to version 0.7.1
-* Fri Mar 11 2005 - lnussel@suse.de
+* Fri Mar 11 2005 lnussel@suse.de
 - check if /dev/lircd is already a symlink before creating it (#71063)
 - don't unload module when stopping lirc (#71063)
-* Tue Mar 01 2005 - kraxel@suse.de
+* Tue Mar 01 2005 kraxel@suse.de
 - add compatibility symlink (bug #67039).
-* Mon Jan 24 2005 - kraxel@suse.de
+* Mon Jan 24 2005 kraxel@suse.de
 - update to 0.7.0 final.
 - move lircd sockets from /dev to /var/run/lirc (bug #44254).
-* Fri Aug 20 2004 - kraxel@suse.de
+* Fri Aug 20 2004 kraxel@suse.de
 - update to cvs [2004-08-20]
-* Tue Mar 30 2004 - kraxel@suse.de
+* Tue Mar 30 2004 kraxel@suse.de
 - add README.SUSE file (by lnussel)
 - remove some files non-text files from documentation (bug #36349).
-* Fri Mar 12 2004 - kraxel@suse.de
+* Fri Mar 12 2004 kraxel@suse.de
 - fix lirc start script.
-* Mon Mar 08 2004 - kraxel@suse.de
+* Mon Mar 08 2004 kraxel@suse.de
 - update to cvs [2004-03-08]
 - dropped global config file patch (merged into cvs).
-* Fri Mar 05 2004 - kraxel@suse.de
+* Fri Mar 05 2004 kraxel@suse.de
 - update to cvs [2004-03-05]
 - init script fixes.
-* Mon Mar 01 2004 - kraxel@suse.de
+* Mon Mar 01 2004 kraxel@suse.de
 - update to cvs [2004-03-01]
 - added input-layer-lircd.conf
 - added global config file patch (by msvec@suse.cz).
-* Thu Feb 05 2004 - kraxel@suse.de
+* Thu Feb 05 2004 kraxel@suse.de
 - drop km_lirc.
-* Mon Jan 19 2004 - kraxel@suse.de
+* Mon Jan 19 2004 kraxel@suse.de
 - updated to cvs snapshot again [2004-01-16].
-* Tue Oct 21 2003 - kraxel@suse.de
+* Tue Oct 21 2003 kraxel@suse.de
 - updated to 0.7.0 cvs snapshot.
-* Thu Aug 14 2003 - kraxel@suse.de
+* Thu Aug 14 2003 kraxel@suse.de
 - Respect INSTALL_MOD_PATH.
-* Thu Aug 14 2003 - kraxel@suse.de
+* Thu Aug 14 2003 kraxel@suse.de
 - added ServiceRestart to sysconfig.lirc (#28893).
-* Thu Aug 14 2003 - kraxel@suse.de
+* Thu Aug 14 2003 kraxel@suse.de
 - fix i2c kernel module build failure.
-* Fri Jun 13 2003 - kukuk@suse.de
+* Fri Jun 13 2003 kukuk@suse.de
 - Add missing directory to filelist
-* Wed Mar 12 2003 - kraxel@suse.de
+* Wed Mar 12 2003 kraxel@suse.de
 - added metadata to sysconfig template [bugzilla #25077]
-* Mon Mar 10 2003 - kraxel@suse.de
+* Mon Mar 10 2003 kraxel@suse.de
 - added init script for lircd [bugzilla #24787]
-* Thu Mar 06 2003 - schwab@suse.de
+* Thu Mar 06 2003 schwab@suse.de
 - Fix invalid use of floating point in kernel.
-* Mon Mar 03 2003 - kraxel@suse.de
+* Mon Mar 03 2003 kraxel@suse.de
 - fixed module install failure (bug #24512).
-* Wed Dec 11 2002 - kraxel@suse.de
+* Wed Dec 11 2002 kraxel@suse.de
 - splitted up the patch.
 - minor specfile tweaks.
-* Tue Oct 22 2002 - uli@suse.de
+* Tue Oct 22 2002 uli@suse.de
 - update -> 0.6.6 (rc tool for sending IR commands, bugfix for
   Winfast TV2000 card, SIR support for Actisys Act200L dongle,
   support for hardware connected to soundcard input, added support
   for Tekram M230 Mach64)
-* Mon Jun 03 2002 - uli@suse.de
+* Mon Jun 03 2002 uli@suse.de
 - added fix for drivers using std serial device by werner@suse.de
 - touch all files to same date to avoid automake rerun
-* Sun Apr 28 2002 - schwab@suse.de
+* Sun Apr 28 2002 schwab@suse.de
 - Fix to build with 2.4.19-pre7.
-* Fri Feb 22 2002 - uli@suse.de
+* Fri Feb 22 2002 uli@suse.de
 - removed many unnecessary files from km_lirc (fixes bug #13733)
-* Mon Jan 28 2002 - uli@suse.de
+* Mon Jan 28 2002 uli@suse.de
 - update -> 0.6.5 (support for additional IR reveivers, bugfixes)
-* Tue Sep 04 2001 - uli@suse.de
+* Tue Sep 04 2001 uli@suse.de
 - added remotes tarball from lirc.org containing configs for a few
   hundred remote controls
-* Tue Aug 21 2001 - lnussel@suse.de
+* Tue Aug 21 2001 lnussel@suse.de
 - new version 0.6.4 (bugfix release)
 - cleaned up spec file, now uses buildroot
 - added example config files for remotes to %%doc
@@ -305,36 +311,36 @@ rm -rf %{buildroot}
 - changed --with-driver=none to =any to make lircd actually use
   remote hardware instead of switching into network only mode
   (fixes Bug #9655)
-* Sat May 12 2001 - schwab@suse.de
+* Sat May 12 2001 schwab@suse.de
 - Fix missing declarations.
-* Wed May 09 2001 - uli@suse.de
+* Wed May 09 2001 uli@suse.de
 - building lirc_dev module in Makefile.module (reqd. by lirc_i2c)
-* Thu Apr 26 2001 - uli@suse.de
+* Thu Apr 26 2001 uli@suse.de
 - fixed Makefile.module, configure call for building with
   "--with-driver=none"
 - disabled parport module (no go with 2.4.3)
-* Thu Apr 05 2001 - uli@suse.de
+* Thu Apr 05 2001 uli@suse.de
 - kernel sources not needed any more
-* Mon Mar 19 2001 - uli@suse.de
+* Mon Mar 19 2001 uli@suse.de
 - building lirc_i2c module in Makefile.module
-* Mon Mar 19 2001 - uli@suse.de
+* Mon Mar 19 2001 uli@suse.de
 - update -> 0.6.3 final
 - added suse_update_config before configure (fixes IA64)
 - disabled useless building of drivers
 - fixed building of shared libs
-* Thu Feb 22 2001 - uli@suse.de
+* Thu Feb 22 2001 uli@suse.de
 - added -I/usr/src/linux/include to kernel module Makefiles
-* Wed Feb 07 2001 - uli@suse.de
+* Wed Feb 07 2001 uli@suse.de
 - added lx_suse to neededforbuild
-* Fri Jan 12 2001 - uli@suse.de
+* Fri Jan 12 2001 uli@suse.de
 - update -> 0.6.3pre3 (needed for kernels 2.2.18 and 2.4.0)
-* Tue Oct 10 2000 - ro@suse.de
+* Tue Oct 10 2000 ro@suse.de
 - fixed oldconfig
-* Mon Oct 09 2000 - kukuk@suse.de
+* Mon Oct 09 2000 kukuk@suse.de
 - Use default values for make oldconfig
-* Fri Sep 15 2000 - uli@suse.de
+* Fri Sep 15 2000 uli@suse.de
 - fixed location of config file (/usr/etc -> /etc)
-* Fri Sep 15 2000 - uli@suse.de
+* Fri Sep 15 2000 uli@suse.de
 - fixed Makefile.module
-* Wed Sep 13 2000 - uli@suse.de
+* Wed Sep 13 2000 uli@suse.de
 - initial package