diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules
index c74b7a62ac..48a2a9515f 100644
--- a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules
+++ b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules
@@ -6,6 +6,7 @@
 ACTION!="add|remove", GOTO="end"
 
 KERNEL=="hiddev[0-9]*", SUBSYSTEM=="usb",  SUBSYSTEMS=="usb", GOTO="begin"
+KERNEL=="ttyACM[0-9]*", SUBSYSTEM=="tty",  SUBSYSTEMS=="usb", GOTO="begin"
 KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="i2c", GOTO="begin"
 KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="usb", GOTO="begin"
 KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="platform", GOTO="begin"
@@ -36,7 +37,6 @@ SUBSYSTEM=="lirc", DRIVERS=="lirc_rpi", \
 # up as event devices are not included as as they are handled by eventlircd.
 #-------------------------------------------------------------------------------
 SUBSYSTEMS=="usb", GOTO="begin-usb"
-SUBSYSTEMS=="usb", GOTO="begin-usb"
 GOTO="end-usb"
 LABEL="begin-usb"
 
diff --git a/packages/sysutils/remote/lirc/patches/lirc-0.9.0-030-usb_irtoy.patch b/packages/sysutils/remote/lirc/patches/lirc-0.9.0-030-usb_irtoy.patch
index f3be444262..5a313df8dd 100644
--- a/packages/sysutils/remote/lirc/patches/lirc-0.9.0-030-usb_irtoy.patch
+++ b/packages/sysutils/remote/lirc/patches/lirc-0.9.0-030-usb_irtoy.patch
@@ -1,8 +1,7 @@
-diff --git c/configure.ac w/configure.ac
-index 052908b..2cd46ff 100644
---- c/configure.ac
-+++ w/configure.ac
-@@ -154,6 +154,7 @@ possible_drivers="(none) \
+diff -Naur lirc-0.9.0/configure.ac lirc-0.9.0.patch/configure.ac
+--- lirc-0.9.0/configure.ac	2013-06-01 05:14:37.836893013 +0200
++++ lirc-0.9.0.patch/configure.ac	2013-06-01 05:15:53.523904976 +0200
+@@ -154,6 +154,7 @@
  	(uirt2) \
  	(uirt2_raw) \
  	(usb_uirt_raw) \
@@ -10,7 +9,7 @@ index 052908b..2cd46ff 100644
  	(usbx) \
  	(udp)"
  
-@@ -446,7 +447,7 @@ AC_ARG_WITH(driver,
+@@ -444,7 +445,7 @@
                            srm7500libusb, tekram,
                            tekram_bt829, tira, tira_raw, ttusbir,
                            tuxbox, udp, uirt2, uirt2_raw,
@@ -19,7 +18,7 @@ index 052908b..2cd46ff 100644
  driver=${withval},
  driver="unset"
  )
-@@ -680,6 +681,9 @@ if test "$driver" = "userspace" -o "$driver" = "all"; then
+@@ -675,6 +676,9 @@
  	uirt2_raw|usb_uirt_raw)
  		hw_module="${hw_module} hw_uirt2_raw.o hw_uirt2_common.o serial.o receive.o transmit.o"
  		;;
@@ -29,7 +28,7 @@ index 052908b..2cd46ff 100644
  	usbx)
  		hw_module="${hw_module} hw_usbx.o serial.o"
  		;;
-@@ -1391,6 +1395,11 @@ if test "$driver" = "uirt2_raw"; then
+@@ -1329,6 +1333,11 @@
    hw_module="hw_uirt2_raw.o hw_uirt2_common.o serial.o receive.o transmit.o"
    HW_DEFAULT="hw_uirt2_raw"
  fi
@@ -41,11 +40,10 @@ index 052908b..2cd46ff 100644
  if test "$driver" = "usb_uirt_raw"; then
    lirc_driver="none"
    hw_module="hw_uirt2_raw.o hw_uirt2_common.o serial.o receive.o transmit.o"
-diff --git c/daemons/hw-types.c w/daemons/hw-types.c
-index 0536ea2..b11cbdf 100644
---- c/daemons/hw-types.c
-+++ w/daemons/hw-types.c
-@@ -58,6 +58,7 @@ extern struct hardware hw_udp;
+diff -Naur lirc-0.9.0/daemons/hw-types.c lirc-0.9.0.patch/daemons/hw-types.c
+--- lirc-0.9.0/daemons/hw-types.c	2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.patch/daemons/hw-types.c	2013-06-01 05:17:24.821961521 +0200
+@@ -58,6 +58,7 @@
  extern struct hardware hw_uirt2;
  extern struct hardware hw_uirt2_raw;
  extern struct hardware hw_usb_uirt_raw;
@@ -53,11 +51,17 @@ index 0536ea2..b11cbdf 100644
  extern struct hardware hw_usbx;
  
  #ifndef HW_DEFAULT
-diff --git c/daemons/hw_usbirtoy.c w/daemons/hw_usbirtoy.c
-new file mode 100644
-index 0000000..ed2df85
---- /dev/null
-+++ w/daemons/hw_usbirtoy.c
+@@ -172,6 +173,7 @@
+ 	&hw_uirt2,
+ 	&hw_uirt2_raw,
+ 	&hw_usb_uirt_raw,
++	&hw_usbirtoy,
+ 	&hw_usbx,
+ #else
+ 	&HW_DEFAULT,
+diff -Naur lirc-0.9.0/daemons/hw_usbirtoy.c lirc-0.9.0.patch/daemons/hw_usbirtoy.c
+--- lirc-0.9.0/daemons/hw_usbirtoy.c	1970-01-01 01:00:00.000000000 +0100
++++ lirc-0.9.0.patch/daemons/hw_usbirtoy.c	2013-06-01 05:15:53.524904977 +0200
 @@ -0,0 +1,607 @@
 +/****************************************************************************
 + ** hw_usbirtoy.c **********************************************************
@@ -666,11 +670,21 @@ index 0000000..ed2df85
 +}
 +
 +
-diff --git c/setup.data w/setup.data
-index 407d6b2..99be615 100644
---- c/setup.data
-+++ w/setup.data
-@@ -119,6 +119,7 @@ hw_menu_entry: @hw-usb
+diff -Naur lirc-0.9.0/daemons/Makefile.am lirc-0.9.0.patch/daemons/Makefile.am
+--- lirc-0.9.0/daemons/Makefile.am	2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.patch/daemons/Makefile.am	2013-06-01 05:17:24.823961522 +0200
+@@ -55,6 +55,7 @@
+ 			hw_udp.c \
+ 			hw_uirt2.c hw_uirt2_raw.c \
+ 			hw_uirt2_common.c hw_uirt2_common.h \
++			hw_usbirtoy.c \
+ 			hw_usbx.c hw_usbx.h \
+ 			receive.c receive.h \
+ 			transmit.c transmit.h \
+diff -Naur lirc-0.9.0/setup.data lirc-0.9.0.patch/setup.data
+--- lirc-0.9.0/setup.data	2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.patch/setup.data	2013-06-01 05:15:53.525904978 +0200
+@@ -119,6 +119,7 @@
  	awlibusb: "Awox RF/IR Remote (userspace)"
  	sb0540: "Creative USB IR Receiver (SB0540)"
  	commandir: "CommandIR Multi-IR Transceiver (userspace)"
@@ -678,7 +692,7 @@ index 407d6b2..99be615 100644
  	dfclibusb: "DFC USB InfraRed Remote Control (userspace)"
  	sasem: "Dign HV5 HTPC IR/VFD Module"
  	dvico: "DViCO USB Remote"
-@@ -147,6 +148,7 @@ hw_menu_entry: @hw-usb
+@@ -147,6 +148,7 @@
  	mplay: "VLSystem MPlay Blast"
  	mplay: "VLSystem MPlay Mini"
  
@@ -686,7 +700,7 @@ index 407d6b2..99be615 100644
  param_type: \
  	act200l \
  	act220l \
-@@ -190,6 +192,9 @@ param_type: \
+@@ -190,6 +192,9 @@
  	usbx
  	ttyUSB:
  
@@ -696,7 +710,7 @@ index 407d6b2..99be615 100644
  param_type: \
  	adaptec \
  	alsa_usb \
-@@ -390,6 +395,10 @@ default_param: \
+@@ -390,6 +395,10 @@
  	usbx
  	ttyUSB1:
  
@@ -707,7 +721,7 @@ index 407d6b2..99be615 100644
  remote: \
  	hauppauge \
  	hauppauge_dvb \
-@@ -424,6 +433,7 @@ remote: \
+@@ -424,6 +433,7 @@
  	ttusbir \
  	uirt2_raw \
  	udp \
@@ -715,11 +729,10 @@ index 407d6b2..99be615 100644
  	usb_uirt_raw \
  	wpc8769l
  	any:
-diff --git c/setup.sh w/setup.sh
-index 342f32d..a3546b5 100755
---- c/setup.sh
-+++ w/setup.sh
-@@ -65,6 +65,10 @@ GetSelectedDriver ()
+diff -Naur lirc-0.9.0/setup.sh lirc-0.9.0.patch/setup.sh
+--- lirc-0.9.0/setup.sh	2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.patch/setup.sh	2013-06-01 05:15:53.525904978 +0200
+@@ -65,6 +65,10 @@
      elif test "$DRIVER_PARAMETER" = "ttyUSB2"; then COM2="on"; IRTTY="/dev/ttyUSB1"; LIRC_PORT="none"; LIRC_IRQ="none"
      elif test "$DRIVER_PARAMETER" = "ttyUSB3"; then COM3="on"; IRTTY="/dev/ttyUSB2"; LIRC_PORT="none"; LIRC_IRQ="none"
      elif test "$DRIVER_PARAMETER" = "ttyUSB4"; then COM4="on"; IRTTY="/dev/ttyUSB3"; LIRC_PORT="none"; LIRC_IRQ="none"
@@ -730,7 +743,7 @@ index 342f32d..a3546b5 100755
      elif test "$DRIVER_PARAMETER" = "com1"; then COM1="on"; LIRC_PORT=$COM1_PORT; LIRC_IRQ=$COM1_IRQ
      elif test "$DRIVER_PARAMETER" = "com2"; then COM2="on"; LIRC_PORT=$COM2_PORT; LIRC_IRQ=$COM2_IRQ
      elif test "$DRIVER_PARAMETER" = "com3"; then COM3="on"; LIRC_PORT=$COM3_PORT; LIRC_IRQ=$COM3_IRQ
-@@ -207,6 +211,30 @@ SetPortAndIrq ()
+@@ -207,6 +211,30 @@
  	else
  	    return 1;
          fi
@@ -761,7 +774,7 @@ index 342f32d..a3546b5 100755
      fi
      return 0;
      }
-@@ -347,7 +375,7 @@ SaveConfig ()
+@@ -347,7 +375,7 @@
  	else echo "--without-timer \\" >>$START;
  	fi
          }