--- /etc/init.d/lircd.bak       2011-06-16 14:50:57.965689000 +0100
+++ /etc/init.d/lircd   2011-06-17 12:27:51.425689002 +0100
@@ -72,6 +72,18 @@
                RETVAL=$?
                [ ${RETVAL} -eq 0 ] && touch /var/lock/subsys/lircd

+                # To prevent double key events w/both in-kernel and lirc decode,
+                # we disable the in-kernel decoding when lircd is started up
+                # successfully
+                if [ ${RETVAL} -eq 0 ]; then
+                   if [ $(echo "${DRIVER}" | grep -c "dev.*input") -lt 1 ]; then
+                   rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
+                      for rc in $rcs; do
+                              echo lirc > ${rc} 2> /dev/null
+                      done
+                   fi
+                fi
+
            else

                 gprintf "Starting Linux Infrared Remote Control daemon:"
@@ -98,6 +110,18 @@

                fi

+                # On lircd shutdown, turn all the in-kernel IR decoders back on
+                rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
+                for rc in $rcs
+                do
+                    echo none > ${rc} 2> /dev/null
+                    protos=$(cat ${rc})
+                    for p in $protos
+                    do
+                       echo "+${p}" > ${rc} 2> /dev/null
+                    done
+                done
+
                echo

            else