diff --git a/packages/addons/driver/hdhomerun/changelog.txt b/packages/addons/driver/hdhomerun/changelog.txt
index bb50573509..f27a1eca6c 100644
--- a/packages/addons/driver/hdhomerun/changelog.txt
+++ b/packages/addons/driver/hdhomerun/changelog.txt
@@ -1,3 +1,5 @@
+4.1.1
+  clean up
 4.1.0
   rebuild for addon api bump
 4.0.1
diff --git a/packages/addons/driver/hdhomerun/package.mk b/packages/addons/driver/hdhomerun/package.mk
index dd298a3f1f..dfe517ab11 100644
--- a/packages/addons/driver/hdhomerun/package.mk
+++ b/packages/addons/driver/hdhomerun/package.mk
@@ -18,7 +18,7 @@
 
 PKG_NAME="hdhomerun"
 PKG_VERSION="4.1"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
diff --git a/packages/addons/driver/hdhomerun/source/bin/hdhomerun.stop b/packages/addons/driver/hdhomerun/source/bin/hdhomerun.stop
deleted file mode 100644
index 640c0668da..0000000000
--- a/packages/addons/driver/hdhomerun/source/bin/hdhomerun.stop
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. /etc/profile
-
-logger -t Hdhomerun "### Hdhomerun manual stop ###"
-killall userhdhomerun
diff --git a/packages/addons/driver/hdhomerun/source/bin/hdhomerun.start b/packages/addons/driver/hdhomerun/source/sleep.d/99-hdhomerun.power
similarity index 75%
rename from packages/addons/driver/hdhomerun/source/bin/hdhomerun.start
rename to packages/addons/driver/hdhomerun/source/sleep.d/99-hdhomerun.power
index 043696460a..f2387e6a47 100644
--- a/packages/addons/driver/hdhomerun/source/bin/hdhomerun.start
+++ b/packages/addons/driver/hdhomerun/source/sleep.d/99-hdhomerun.power
@@ -20,7 +20,17 @@
 
 . /etc/profile
 
-ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
+oe_setup_addon driver.dvb.hdhomerun
 
-logger -t Hdhomerun "### Hdhomerun manual start ###"
-. $ADDON_DIR/bin/userspace-driver.sh
+if [ "$SUSPEND_DRIVER" = "true" ]; the
+  case "$1" in
+    pre)
+      killall -9 userhdhomerun &>/dev/null
+      rmmod dvb_hdhomerun_fe &>/dev/null
+      rmmod dvb_hdhomerun &>/dev/null
+      rmmod dvb_hdhomerun_core &>/dev/null
+      ;;
+    post)
+      ;;
+  esac
+fi
diff --git a/packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power b/packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power
deleted file mode 100644
index 825144aa16..0000000000
--- a/packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. /etc/profile
-
-HDHR_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
-HDHR_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun"
-HDHR_ADDON_SETTINGS="$HDHR_ADDON_HOME/settings.xml"
-
-if [ ! -f "$HDHR_ADDON_SETTINGS" ]; then
-  cp $HDHR_ADDON_DIR/settings-default.xml $HDHR_ADDON_SETTINGS
-fi
-
-mkdir -p /var/config
-cat "$HDHR_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/hdhomerun-addon.conf
-. /var/config/hdhomerun-addon.conf
-
-if [ "$SUSPEND_DRIVER" = "true" ]; then
-  LOCKDIR="/var/lock"
-  LOCKFILE="$LOCKDIR/hdhomerun"
-
-  case "$1" in
-    hibernate|suspend|pre)
-      if [ -n "$(pidof userhdhomerun)" ]; then
-        progress "Shutting down HDHomeRun driver for suspending..."
-        mkdir -p "$LOCKDIR"
-        touch "$LOCKFILE"
-        killall -9 userhdhomerun
-      fi
-      ;;
-
-    thaw|resume|post)
-      if [ -f "$LOCKFILE" ]; then
-        # driver started within Tvheadend/VDR
-        rm -f "$LOCKFILE"
-      fi
-      ;;
-
-    *) exit $NA
-      ;;
-  esac
-else
-  progress "Suspend/resume of HDHomeRun driver not enabled..."
-fi