diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 854cf420968670..441c9c3d3fb101 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,19 +1,20 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
-version=3.4.1
-revision=21
+version=3.6.2
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config python3-setuptools python3-devel vala-devel"
 makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
  libical-devel libxklavier-devel zeitgeist-devel libsensors-devel vala-devel
- cairo-dock-devel gnome-menus-devel vte3-devel python3-devel upower-devel"
-depends="cairo-dock>=${version} upower"
+ cairo-dock-devel gnome-menus-devel vte3-devel python3-devel upower-devel libetpan-devel
+ libdbusmenu-glib-devel libayatana-indicator-devel libXxf86vm-devel libdbusmenu-gtk3-devel libetpan-devel"
+depends="cairo-dock>=${version} upower python3 python3-dbus python3-gobject ruby wget gvfs"
 short_desc="Plugins for cairo-dock"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://launchpad.net/cairo-dock"
-distfiles="http://launchpad.net/cairo-dock-plug-ins/${version%.?}/${version}/+download/cairo-dock-plug-ins-${version}.tar.gz"
-checksum=e09b8e600398749d1f74b26e645b477a1844a3eea02fcadd6877935da3f8639e
+distfiles="https://github.com/Cairo-Dock/cairo-dock-plug-ins/archive/refs/tags/${version}.tar.gz"
+checksum=a93700e9633d7562f34af83b5f0a0a97b24915dd2ae908c2e627acec2e4b295e
 
 CFLAGS="-fcommon"
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -23,15 +24,30 @@ fi
 pre_configure() {
 	# Disable Logout plugin
 	echo -n > logout/CMakeLists.txt
+
+	# libetpan-devel ships libetpan-config but no .pc file
+	mkdir -p ${wrksrc}/pc
+	cat > ${wrksrc}/pc/libetpan.pc <<-EOF
+	Name: libetpan
+	Description: mail library
+	Version: 1.9.3
+	Libs: $(libetpan-config --libs)
+	Cflags: $(libetpan-config --cflags)
+	EOF
+	export PKG_CONFIG_PATH="${wrksrc}/pc:${PKG_CONFIG_PATH}"
 }
 
 cairo-dock-plugins-python3_package() {
-	depends="python3 ${sourcepkg}>=${version}_${revision}"
+	depends="python3 python3-dbus python3-gobject ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - python3 bindings"
 	pkg_install() {
-		vmove ${py3_sitelib}
+		vmove usr/share/cairo-dock/plug-ins/Dbus/CDApplet.py
+		vmove usr/share/cairo-dock/plug-ins/Dbus/CDBashApplet.py
+		vmove usr/share/cairo-dock/plug-ins/Dbus/CairoDock.py
+		vmove usr/share/cairo-dock/plug-ins/Dbus/__pycache__
 	}
 }
+
 cairo-dock-plugins-vala_package() {
 	depends="vala-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Vala bindings"