--- lircd.old	2008-05-23 11:58:13.000000000 +0200
+++ lircd	2008-05-23 12:01:30.000000000 +0200
@@ -9,7 +9,12 @@
   start)
     stat_busy "Starting LIRC Daemon"
     [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
-    [ -z "$PID" ] && /usr/sbin/lircd -d $LIRC_DEVICE $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+    [ -z "$PID" ] && 
+      if [ -n "$LIRC_DEVICE" ] ; then
+        /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+      else
+        /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+      fi
     if [ $? -gt 0 ]; then
       stat_fail
     else