diff --git a/plexupdate-core b/plexupdate-core
index 7baeff1..81500e4 100755
--- a/plexupdate-core
+++ b/plexupdate-core
@@ -228,7 +228,7 @@ isNewerVersion() {
 parseVersion() {
 	if [ "${DISTRO}" = "redhat" ]; then
 		cut -f2- -d- <<< "$1" | cut -f1-4 -d.
-	elif [ "${DISTRO}" = "synology" ]; then
+	elif [ "${DISTRO}" = "synology" -o "${DISTRO}" = "synology-dsm7" ]; then
 		cut -f2-3 -d- <<< "$1"
 	else
 		cut -f2 -d_ <<< "$1"
@@ -240,6 +240,8 @@ getPlexVersion() {
 		dpkg-query --showformat='${Version}' --show plexmediaserver 2>/dev/null
 	elif [ "${DISTRO}" = "synology" ]; then
 		synopkg version "Plex Media Server" 2>/dev/null
+	elif [ "${DISTRO}" = "synology-dsm7" ]; then
+		synopkg version "PlexMediaServer" 2>/dev/null
 	elif [ "${DISTRO}" = "redhat" ]; then
 		local rpmtemp
 		if rpmtemp=$(rpm -q plexmediaserver); then
diff --git a/plexupdate.sh b/plexupdate.sh
index 8d7ce37..467de79 100755
--- a/plexupdate.sh
+++ b/plexupdate.sh
@@ -308,6 +308,9 @@ if [ -z "${DISTRO_INSTALL}" ]; then
 			fi
 		elif [ -f /etc/synoinfo.conf ]; then
 			DISTRO="synology"
+			if grep -q "major=\"7\"" /etc/VERSION; then
+				DISTRO="synology-dsm7"
+			fi
 			DISTRO_INSTALL="synopkg install"
 		else
 			DISTRO="debian"
@@ -493,8 +496,10 @@ if [ "${AUTOINSTALL}" = "yes" ]; then
 	if [ ${RET} -ne 0 ]; then
 		# Clarify why this failed, so user won't be left in the dark
 		error "Failed to install update. Command '${DISTRO_INSTALL} "${DOWNLOADDIR}/${FILENAME}"' returned error code ${RET}"
-		if [ "${DISTRO}" = "synology" -a ${RET} -eq 1 ]; then
-			error "On Synology devices, you need to add Plex's public key to Package Center. If you have not done so, follow the instructions at https://support.plex.tv/articles/205165858-how-to-add-plex-s-package-signing-public-key-to-synology-nas-package-center/"
+		if [ ${RET} -eq 1 ]; then
+			if [ "${DISTRO}" = "synology" || "${DISTRO}" = "synology-dsm7" ]; then
+				error "On Synology devices, you need to add Plex's public key to Package Center. If you have not done so, follow the instructions at https://support.plex.tv/articles/205165858-how-to-add-plex-s-package-signing-public-key-to-synology-nas-package-center/"
+			fi
 		fi
 		exit ${RET}
 	fi
@@ -510,18 +515,20 @@ if [ "${AUTODELETE}" = "yes" ]; then
 fi
 
 if [ "${AUTOSTART}" = "yes" ]; then
-	if [ "${DISTRO}" != "redhat" -a "${DISTRO}" != "synology" ]; then
+	if [ "${DISTRO}" != "redhat" -a "${DISTRO}" != "synology" -a "${DISTRO}" != "synology-dsm7" ]; then
 		warn "The AUTOSTART [-s] option may not be needed on your distribution."
 	fi
-	# Check for systemd
-	if hash systemctl 2>/dev/null; then
+
+	if [ "${DISTRO}" = "synology" ]; then
+		synopkg start "Plex Media Server"
+	elif [ "${DISTRO}" = "synology-dsm7" ]; then
+		synopkg start "PlexMediaServer"
+	elif hash systemctl 2>/dev/null; then
 		systemctl start "$SYSTEMDUNIT"
 	elif hash service 2>/dev/null; then
 		service plexmediaserver start
 	elif [ -x /etc/init.d/plexmediaserver ]; then
 		/etc/init.d/plexmediaserver start
-	elif [ "${DISTRO}" = "synology" ]; then
-		synopkg start "Plex Media Server"
 	else
 		error "AUTOSTART was specified but no startup scripts were found for 'plexmediaserver'."
 		exit 1