diff --git a/packages/sysutils/busybox/init.d/35_wakeup b/packages/sysutils/busybox/init.d/35_wakeup
deleted file mode 100644
index 123d54706c..0000000000
--- a/packages/sysutils/busybox/init.d/35_wakeup
+++ /dev/null
@@ -1,33 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-# setup wakup devices
-#
-# runlevels: openelec
-
-(
-  if [ -f /proc/acpi/wakeup ]; then
-    progress "enable WakeUp devices"
-
-    for device in `cat /proc/acpi/wakeup | grep "^U[H,S][B,C,0-9]" | grep "*disabled" | cut -f1 -d " "`; do
-      echo -n $device > /proc/acpi/wakeup
-    done
-  fi
-)&
diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
index 7eb4eaf6c4..73e42ce990 100644
--- a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
+++ b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
@@ -127,6 +127,9 @@ ENV{ID_VENDOR_ID}=="9022", ENV{ID_MODEL_ID}=="d660", \
   ENV{eventlircd_enable}="true", \
   ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"
 
+# Enable wake-on-usb for the USB remotes.
+  RUN+="wakeup_enable"
+
 LABEL="end-usb"
 
 LABEL="end"
diff --git a/packages/sysutils/remote/eventlircd/udev.d/99-wakeup-usb.rules b/packages/sysutils/remote/eventlircd/udev.d/99-wakeup-usb.rules
deleted file mode 100644
index 2e2b13d1d8..0000000000
--- a/packages/sysutils/remote/eventlircd/udev.d/99-wakeup-usb.rules
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-ACTION!="add|change", GOTO="end"
-SUBSYSTEM!="usb", GOTO="end"
-
-ATTR{power/wakeup}=="disabled", ATTR{power/wakeup}="enabled"
-
-LABEL="end"