diff --git a/spk/tvheadend/Makefile b/spk/tvheadend/Makefile
index 5c8f35a0478..f425fe0c295 100644
--- a/spk/tvheadend/Makefile
+++ b/spk/tvheadend/Makefile
@@ -4,7 +4,7 @@ SPK_GIT_HASH = 28de5c0
 SPK_GIT_DATE = 20240928
 SPK_VERS = $(SPK_SHORT_VERS).$(SPK_GIT_DATE)
 TVH_VERS = $(SPK_SHORT_VERS)~$(SPK_GIT_HASH)
-SPK_REV = 39
+SPK_REV = 40
 SPK_ICON = src/tvheadend.png
 DSM_UI_DIR = app
 
@@ -25,7 +25,7 @@ UNSUPPORTED_ARCHS += $(ARMv5_ARCHS)
 
 WHEELS = src/requirements-pure.txt
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/tvheadend
 DEPENDS += cross/dtv-scan-tables
 DEPENDS += cross/zap2epg cross/docker-tvheadend
 
@@ -34,7 +34,7 @@ DESCRIPTION = Tvheadend is a TV streaming server and recorder for Linux, FreeBSD
 DESCRIPTION_FRE = Tvheadend est un serveur de streaming et enregistreur TV pour Linux, FreeBSD et Android prenant en charge DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT IP et HDHomeRun comme sources d\'entrée. Tvheadend offre le streaming HTTP, HTSP et SAT IP.
 DISPLAY_NAME = Tvheadend
 STARTABLE = yes
-CHANGELOG = "1. Update to latest git version 55404da as of Sept. 20th 2024<br/>2. Update to FFMPEG 7.0.2"
+CHANGELOG = "1. Update to latest git version 55404da as of Sept. 20th 2024. <br/>2. Update to FFMPEG 7.0.2. <br/>3. Fix to use ffmpeg of ffmpeg7 package."
 HOMEPAGE = https://tvheadend.org/
 LICENSE = GPL v3
 
@@ -46,7 +46,7 @@ SERVICE_SETUP = src/service-setup.sh
 
 # Service configuration
 SERVICE_PORT = 9981
-SERVICE_PORT_TITLE = Tvheadend(HTTP)
+SERVICE_PORT_TITLE = Tvheadend (HTTP)
 
 # Admin link
 ADMIN_PORT = ${SERVICE_PORT}
diff --git a/spk/tvheadend/src/service-setup.sh b/spk/tvheadend/src/service-setup.sh
index 6b7421339a0..6ea20ca8098 100644
--- a/spk/tvheadend/src/service-setup.sh
+++ b/spk/tvheadend/src/service-setup.sh
@@ -1,7 +1,7 @@
 # Define python311 binary path
 PYTHON_DIR="/var/packages/python311/target/bin"
 # Define ffmpeg binary path
-FFMPEG_DIR="/var/packages/ffmpeg/target/bin"
+FFMPEG_DIR="/var/packages/ffmpeg7/target/bin"
 # Add local bin, virtualenv along with ffmpeg and python311 to the default PATH
 PATH="${SYNOPKG_PKGDEST}/env/bin:${SYNOPKG_PKGDEST}/bin:${PYTHON_DIR}:${FFMPEG_DIR}:${PATH}"
 
@@ -34,7 +34,7 @@ service_postupgrade ()
     for file in ${UPGRADE_CFG_DIR}/*
     do
         DVR_DIR=$(grep -e 'storage\":' ${file} | awk -F'"' '{print $4}')
-        # Exclude directories in @appstore as ACL permissions srew up package installations
+        # Exclude directories in @appstore as ACL permissions skew up package installations
         TRUNC_DIR=$(echo "$(realpath ${DVR_DIR})" | awk -F/ '{print "/"$3}')
         if [ "${TRUNC_DIR}" = "/@appstore" ]; then
             echo "Skip: ${DVR_DIR} (system directory)"
@@ -45,7 +45,7 @@ service_postupgrade ()
     done
 
     # For backwards compatibility, restore ownership of package system directories
-    if [ $SYNOPKG_DSM_VERSION_MAJOR == 6 ]; then
+    if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ]; then
         echo "Restore '${EFF_USER}' unix permissions on package system directories"
         chown ${EFF_USER}:${USER} "${SYNOPKG_PKGDEST}"
         set_unix_permissions "${SYNOPKG_PKGVAR}"