diff --git a/extra/xfce4-whiskermenu-plugin/.SRCINFO b/extra/xfce4-whiskermenu-plugin/.SRCINFO
index c72b596da..242d61c53 100644
--- a/extra/xfce4-whiskermenu-plugin/.SRCINFO
+++ b/extra/xfce4-whiskermenu-plugin/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = xfce4-whiskermenu-plugin
 	pkgdesc = Menu for Xfce4
 	pkgver = 2.8.3
-	pkgrel = 1
-	url = https://gottcode.org/xfce4-whiskermenu-plugin/
+	pkgrel = 2
+	url = https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start
 	arch = x86_64
 	groups = xfce4-goodies
-	license = GPL2
+	license = GPL-2.0-or-later
 	makedepends = cmake
+	makedepends = git
 	makedepends = ninja
 	depends = accountsservice
 	depends = garcon
 	depends = gtk3
 	depends = gtk-layer-shell
 	depends = xfce4-panel
-	source = https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.8/xfce4-whiskermenu-plugin-2.8.3.tar.bz2
-	sha256sums = e776c287658f98d0739447279522fe78766088438242cf2365a49c8973fc9cd0
+	source = git+https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin.git#tag=v2.8.3
+	sha256sums = cdd4e512be94fc83fdf30578826075adfc1f3c96aea520121d0741665965f7df
 
 pkgname = xfce4-whiskermenu-plugin
diff --git a/extra/xfce4-whiskermenu-plugin/.nvchecker.toml b/extra/xfce4-whiskermenu-plugin/.nvchecker.toml
new file mode 100644
index 000000000..ebd8c0799
--- /dev/null
+++ b/extra/xfce4-whiskermenu-plugin/.nvchecker.toml
@@ -0,0 +1,4 @@
+[xfce4-whiskermenu-plugin]
+source = "git"
+git = "https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin.git"
+prefix = "v"
diff --git a/extra/xfce4-whiskermenu-plugin/PKGBUILD b/extra/xfce4-whiskermenu-plugin/PKGBUILD
index c16e1246f..ec5650f99 100644
--- a/extra/xfce4-whiskermenu-plugin/PKGBUILD
+++ b/extra/xfce4-whiskermenu-plugin/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Brad Fanella <cesura@archlinux.org>
+# Maintainer: Robin Candau <antiz@archlinux.org>
+# Contributor: Brad Fanella <cesura@archlinux.org>
 # Contributor: Alexander F Rødseth <xyproto@archlinux.org>
 # Contributor: Graeme Gott <graeme@gottcode.org>
 
@@ -7,24 +8,25 @@
 
 pkgname=xfce4-whiskermenu-plugin
 pkgver=2.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Menu for Xfce4'
 arch=('x86_64')
-url='https://gottcode.org/xfce4-whiskermenu-plugin/'
+url='https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start'
+license=('GPL-2.0-or-later')
 groups=('xfce4-goodies')
-license=('GPL2')
 depends=('accountsservice' 'garcon' 'gtk3' 'gtk-layer-shell' 'xfce4-panel')
-makedepends=('cmake' 'ninja')
-source=("https://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('e776c287658f98d0739447279522fe78766088438242cf2365a49c8973fc9cd0')
+makedepends=('cmake' 'git' 'ninja')
+source=("git+https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin.git#tag=v${pkgver}")
+sha256sums=('cdd4e512be94fc83fdf30578826075adfc1f3c96aea520121d0741665965f7df')
 
 build() {
-  cmake -B build -S "${srcdir}/${pkgname}-${pkgver}" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
+  cmake -B build -S "${pkgname}" \
+    -DCMAKE_BUILD_TYPE='None' \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
+    -DCMAKE_INSTALL_LIBDIR='lib' \
     -DENABLE_LINK_TIME_OPTIMIZATION=off \
-    -GNinja
+    -GNinja \
+    -Wno-dev
   cmake --build build
 }