diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 5df0651e77c..3d492a24dbe 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,15 +1,15 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=5.4.9
-revision=2
-build_helper=gir
+version=5.8.4
+revision=1
 build_style=meson
-hostmakedepends="libtool pkg-config gobject-introspection gettext
- gettext-devel glib-devel intltool xmlto gtk-doc"
+build_helper="gir"
+hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
+ gtk-doc"
 makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
  muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
  startup-notification-devel pulseaudio-devel dbus-glib-devel xapps-devel
- libgnome-keyring-devel NetworkManager-devel libcroco-devel libsoup-devel
+ libgnome-keyring-devel NetworkManager-devel libcroco-devel
  cinnamon-desktop-devel"
 depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
  cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
@@ -18,14 +18,15 @@ depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
  gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
  network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
  python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
- python3-tinycss python3-pytz python3-distro python3-requests libtimezonemap"
+ python3-tinycss python3-pytz python3-distro python3-requests libtimezonemap
+ libsoup"
 short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon"
 changelog="https://raw.githubusercontent.com/linuxmint/cinnamon/${version}/debian/changelog"
 distfiles="https://github.com/linuxmint/cinnamon/archive/${version}.tar.gz"
-checksum=19c5e85f65baacc79f961cbcebb20fb0050ad6f21678638a9dd1868d197b4727
+checksum=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
 
 python_version=3
 pycompile_dirs="
@@ -45,9 +46,6 @@ pre_configure() {
 	vsed -e '/RequiredComponents/s/$/polkit-gnome-authentication-agent-1;/' \
 		-i cinnamon2d.session.in cinnamon.session.in
 
-	# Check for the cc-panel path, not for the unneeded binary
-	vsed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
-
 	# Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
 	vsed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
 		files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py