diff --git a/packages/addons/service/multimedia/tvheadend/build b/packages/addons/service/multimedia/tvheadend/build
index c45ce63d65..7a69774b76 100755
--- a/packages/addons/service/multimedia/tvheadend/build
+++ b/packages/addons/service/multimedia/tvheadend/build
@@ -34,6 +34,7 @@ cd $PKG_BUILD
             --arch=$TARGET_ARCH \
             --cpu=$TARGET_CPU \
             --cc=$TARGET_CC \
+            --enable-timeshift \
             --enable-bundle
 
 make
diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt
index 150264ddca..636af1b6db 100644
--- a/packages/addons/service/multimedia/tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/tvheadend/changelog.txt
@@ -1,3 +1,6 @@
+3.0.4
+- update to TVHeadend 3.3.402
+
 3.0.3
 - update to TVHeadend 3.3.328
 - add an option to preload capmt_ca.so library
diff --git a/packages/addons/service/multimedia/tvheadend/config/timeshift-config b/packages/addons/service/multimedia/tvheadend/config/timeshift-config
new file mode 100644
index 0000000000..db9a792cc5
--- /dev/null
+++ b/packages/addons/service/multimedia/tvheadend/config/timeshift-config
@@ -0,0 +1,9 @@
+{
+	"enabled": 0,
+	"ondemand": 0,
+	"path": "/storage/.xbmc/userdata/addon_data/service.multimedia.tvheadend/cache/timeshift",
+	"unlimited_period": 0,
+	"max_period": 3600,
+	"unlimited_size": 0,
+	"max_size": 1024
+}
diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta
index ac201c9375..8e668c4c0f 100644
--- a/packages/addons/service/multimedia/tvheadend/meta
+++ b/packages/addons/service/multimedia/tvheadend/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.3.328"
+PKG_VERSION="3.3.402"
 PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
index 08c859ea9b..d39b22dc8f 100755
--- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
+++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
@@ -37,6 +37,9 @@ XMLTV_SETTINGS_FILE="$XMLTV_SETTINGS_DIR/config"
 DVR_SETTINGS_DIR="$ADDON_HOME/dvr"
 DVR_SETTINGS_FILE="$DVR_SETTINGS_DIR/config"
 DVR_DIR="$HOME/recordings"
+TIMESHIFT_SETTINGS_DIR="$ADDON_HOME/timeshift"
+TIMESHIFT_SETTINGS_FILE="$TIMESHIFT_SETTINGS_DIR/config"
+TIMESHIFT_DIR="$ADDON_HOME/cache/timeshift"
 
 ## handle upgrade. this should be removed later
 
@@ -81,6 +84,16 @@ if [ ! -f "$DVR_SETTINGS_FILE" ]; then
   fi
 fi
 
+if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
+  mkdir -p $TIMESHIFT_DIR
+  mkdir -p $TIMESHIFT_SETTINGS_DIR
+  if [ -f $ADDON_DIR/timeshift-config ]; then
+    cp $ADDON_DIR/timeshift-config $TIMESHIFT_SETTINGS_FILE
+  elif [ -f $ADDON_SYS_DIR/timeshift-config ]; then
+    cp $ADDON_SYS_DIR/timeshift-config $TIMESHIFT_SETTINGS_FILE
+  fi
+fi
+
 TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
 
 mkdir -p /var/config