--- lircd.old	2008-03-05 18:09:09.000000000 +0100
+++ lircd	2008-03-05 17:59:37.000000000 +0100
@@ -8,8 +8,9 @@
 case "$1" in
   start)
     stat_busy "Starting LIRC Daemon"
+    [ -n "$LIRC_DEVICE" ] && LIRC_DEVICE="-d $LIRC_DEVICE"
     [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
-    [ -z "$PID" ] && /usr/sbin/lircd -d $LIRC_DEVICE $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+    [ -z "$PID" ] && /usr/sbin/lircd $LIRC_DEVICE $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
     if [ $? -gt 0 ]; then
       stat_fail
     else