diff --git a/packages/multimedia/tvheadend/build b/packages/multimedia/hts-tvheadend/build
similarity index 100%
rename from packages/multimedia/tvheadend/build
rename to packages/multimedia/hts-tvheadend/build
diff --git a/packages/multimedia/tvheadend/init.d/55_tvheadend b/packages/multimedia/hts-tvheadend/init.d/55_tvheadend
similarity index 100%
rename from packages/multimedia/tvheadend/init.d/55_tvheadend
rename to packages/multimedia/hts-tvheadend/init.d/55_tvheadend
diff --git a/packages/multimedia/tvheadend/install b/packages/multimedia/hts-tvheadend/install
similarity index 100%
rename from packages/multimedia/tvheadend/install
rename to packages/multimedia/hts-tvheadend/install
diff --git a/packages/multimedia/hts-tvheadend/meta b/packages/multimedia/hts-tvheadend/meta
new file mode 100644
index 0000000000..d61abaa624
--- /dev/null
+++ b/packages/multimedia/hts-tvheadend/meta
@@ -0,0 +1,16 @@
+PKG_NAME="hts-tvheadend"
+PKG_VERSION="2.12"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
+PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz"
+PKG_DEPENDS="avahi"
+PKG_BUILD_DEPENDS="toolchain avahi"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="hts-tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
+PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
diff --git a/packages/multimedia/tvheadend/meta b/packages/multimedia/tvheadend/meta
deleted file mode 100644
index bdee0c62da..0000000000
--- a/packages/multimedia/tvheadend/meta
+++ /dev/null
@@ -1,16 +0,0 @@
-PKG_NAME="tvheadend"
-PKG_VERSION="5650"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
-PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="avahi"
-PKG_BUILD_DEPENDS="toolchain avahi"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
-PKG_LONGDESC="Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes"
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
diff --git a/scripts/image b/scripts/image
index ac242fb063..e91d522b52 100755
--- a/scripts/image
+++ b/scripts/image
@@ -69,7 +69,7 @@ mkdir -p $INSTALL
 
 # Multimedia support
   [ ! "$MEDIACENTER" = no ] && $SCRIPTS/install mediacenter
-  [ "$TVHEADEND" = yes ] && $SCRIPTS/install tvheadend
+  [ "$TVHEADEND" = yes ] && $SCRIPTS/install hts-tvheadend
 
 # Automounter support
   [ "$UDISKS" = yes ] && $SCRIPTS/install udisks