diff --git a/.gitignore b/.gitignore
index 9097367..223072f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,30 @@
-/xfce4-panel-*.tar.bz2
+xfce4-panel-4.6.4.tar.bz2
+/xfce4-panel-4.7.7.tar.bz2
+/xfce4-panel-4.8.0.tar.bz2
+/xfce4-panel-4.8.1.tar.bz2
+/xfce4-panel-4.8.2.tar.bz2
+/xfce4-panel-4.8.3.tar.bz2
+/xfce4-panel-4.8.4.tar.bz2
+/xfce4-panel-4.8.5.tar.bz2
+/xfce4-panel-4.8.6.tar.bz2
+/xfce4-panel-4.9.1.tar.bz2
+/xfce4-panel-4.9.2.tar.bz2
+/xfce4-panel-4.10.0.tar.bz2
+/xfce4-panel-4.10.1.tar.bz2
+/xfce4-panel-4.12.0.tar.bz2
+/xfce4-panel-4.12.1.tar.bz2
+/xfce4-panel-4.12.2.tar.bz2
+/xfce4-panel-4.13.3.tar.bz2
+/xfce4-panel-4.13.4.tar.bz2
+/xfce4-panel-4.13.5.tar.bz2
+/xfce4-panel-4.13.6.tar.bz2
+/xfce4-panel-4.13.7.tar.bz2
+/xfce4-panel-4.14.0.tar.bz2
+/xfce4-panel-4.14.1.tar.bz2
+/xfce4-panel-4.14.3.tar.bz2
+/xfce4-panel-4.14.4.tar.bz2
+/xfce4-panel-4.16.0.tar.bz2
+/xfce4-panel-4.16.1.tar.bz2
+/xfce4-panel-4.16.2.tar.bz2
+/xfce4-panel-4.16.3.tar.bz2
+/xfce4-panel-4.16.4.tar.bz2
diff --git a/perform_sanity_checks.patch b/perform_sanity_checks.patch
new file mode 100644
index 0000000..f864ecc
--- /dev/null
+++ b/perform_sanity_checks.patch
@@ -0,0 +1,31 @@
+From 5ec17b6d1166e7dc4a9fe7d45169252335bdf1da Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
+Date: Sat, 16 Jul 2022 09:06:09 +0200
+Subject: [PATCH] systray: Perform sanity checks also for "NewStatus" signal
+ (Fixes #602)
+
+---
+ plugins/systray/sn-item.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/plugins/systray/sn-item.c b/plugins/systray/sn-item.c
+index dc891e07..056fab08 100644
+--- a/plugins/systray/sn-item.c
++++ b/plugins/systray/sn-item.c
+@@ -579,6 +579,13 @@ sn_item_signal_received (GDBusProxy *proxy,
+     }
+   else if (!g_strcmp0 (signal_name, "NewStatus"))
+     {
++      finish_and_return_if_true (parameters == NULL);
++      if (! g_variant_check_format_string (parameters, "(s)", FALSE))
++        {
++          g_warning ("Could not parse properties for StatusNotifierItem.");
++          return;
++        }
++
+       g_variant_get (parameters, "(s)", &status);
+       exposed = sn_item_status_is_exposed (status);
+       g_free (status);
+-- 
+GitLab
+
diff --git a/sources b/sources
index 1fdc80a..a87df20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xfce4-panel-4.20.8.tar.bz2) = 00091b216251ca77b0777a672f5a4eca7009d19ee117212cd607d268ac66bc1b789bda606420a0b5213cab485a9eee1984a69f0e9bbd71c358b0683c6ceb4e8a
+SHA512 (xfce4-panel-4.16.4.tar.bz2) = a1ad5a528968c4b1a5d2fb1537f7774aeeb525d7cb2f77e261b187b94e9de22f018bbd47d462ce4ad09b360126548d5848e46643df40549f9f8a3c44a4a14564
diff --git a/xfce4-panel.spec b/xfce4-panel.spec
index 341b276..8715600 100644
--- a/xfce4-panel.spec
+++ b/xfce4-panel.spec
@@ -1,5 +1,4 @@
-%global xfceversion 4.20
-%global forgeurl https://gitlab.xfce.org/xfce/xfce4-panel
+%global xfceversion 4.16
 
 %global namespc Libxfce4panel
 
@@ -11,37 +10,36 @@
 %global _with_vala 0
 
 Name:           xfce4-panel
-Version:        4.20.8
-%forgemeta
+Version:        4.16.4
 Release:        %autorelease
 Summary:        Next generation panel for Xfce
 
-License:        GPL-2.0-or-later AND LGPL-2.0-or-later
+License:        GPLv2+ and LGPLv2+
 URL:            http://www.xfce.org/
 #VCS git:git://git.xfce.org/xfce/xfce4-panel
-Source0:        %{forgesource}
+Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 
 # clock icon taken from system-config-date, license is GPLv2+
 Source1:        xfce4-clock.png
 Source2:        xfce4-clock.svg
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  exo-devel >= 0.3.93
-BuildRequires:  garcon-devel >= 0.6.0
-BuildRequires:  gcc
-BuildRequires:  gettext
-BuildRequires:  gobject-introspection-devel
-BuildRequires:  gtk-doc
-BuildRequires:  gtk-layer-shell-devel >= 0.7.0
+Patch0:         perform_sanity_checks.patch
+
+BuildRequires:  make
+BuildRequires:  gcc-c++
 BuildRequires:  gtk3-devel
-BuildRequires:  libwnck3-devel >= 3.14
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
-BuildRequires:  libxfce4windowing-devel >= 4.20.6
-BuildRequires:  libxml2-devel >= 2.4.0
-BuildRequires:  meson
-BuildRequires:  startup-notification-devel
-BuildRequires:  xfce4-dev-tools
 BuildRequires:  xfconf-devel >= %{xfceversion}
+BuildRequires:  garcon-devel >= 0.6.0
+BuildRequires:  libxml2-devel >= 2.4.0
+BuildRequires:  startup-notification-devel
+BuildRequires:  exo-devel >= 0.3.93
+BuildRequires:  libwnck3-devel >= 3.14
+BuildRequires:  gettext
+BuildRequires:  intltool
+BuildRequires:  desktop-file-utils
+BuildRequires:  gtk-doc
+BuildRequires:  gobject-introspection-devel
 
 %if 0%{?fedora}
 BuildRequires:  libdbusmenu-gtk3-devel
@@ -65,9 +63,9 @@ This package includes the panel for the Xfce desktop environment.
 %package devel
 Summary:        Development headers for xfce4-panel
 Requires:       %{name} = %{version}-%{release}
-Requires:       libxfce4ui-devel >= %{xfceversion}
-Requires:       libxfce4util-devel >= %{xfceversion}
 Requires:       pkgconfig
+Requires:       libxfce4util-devel >= %{xfceversion}
+Requires:       libxfce4ui-devel >= %{xfceversion}
 
 %description devel
 This package includes the header files you will need to build
@@ -75,31 +73,29 @@ plugins for xfce4-panel.
 
 
 %prep
-%forgeautosetup -p1
+%autosetup -p1
 
 # Fix icon in 'Add new panel item' dialog
 sed -i 's|Icon=office-calendar|Icon=xfce4-clock|g' plugins/clock/clock.desktop.in.in
 
 
 %build
-%meson \
-  -Dgtk-doc=true \
-%if %{_with_vala}
-  -Dvala=enabled
-%else
-  -Dvala=disabled
-%endif
+%configure --enable-gtk-doc --disable-static 
 
-%meson_build
+# Remove rpaths
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
+# The LD_LIBRARY_PATH hack is needed for --enable-gtk-doc
+# because lt-libxfce4panel-scan is linked against libxfce4panel
+export LD_LIBRARY_PATH="`pwd`/libxfce4panel/.libs"
+
+%make_build
 
 %install
-%meson_install
+%make_install
 
-# Rename invalid hye locale to hy
-if [ -d %{buildroot}%{_datadir}/locale/hye ]; then
-  mv %{buildroot}%{_datadir}/locale/hye %{buildroot}%{_datadir}/locale/hy
-fi
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %find_lang %{name}
 
@@ -110,22 +106,15 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/panel-preferences.de
 install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
 
-
-%check
-%meson_test
-
-
 %files -f %{name}.lang
 %license COPYING
 %doc AUTHORS ChangeLog NEWS
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/default.xml
-%{_bindir}/xfce4-panel
-%{_bindir}/xfce4-popup-applicationsmenu
-%{_bindir}/xfce4-popup-directorymenu
-%{_bindir}/xfce4-popup-windowmenu
+%{_bindir}/*
 %{_libdir}/libxfce4panel-*.so.*
 %{_libdir}/xfce4/panel/
 %{_libdir}/girepository-1.0/%{namespc}-2.0.typelib
+%{_datadir}/gir-1.0/%{namespc}-2.0.gir
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/xfce4/panel/
 %{_datadir}/applications/*.desktop
@@ -137,7 +126,6 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
 %files devel
 %{_libdir}/pkgconfig/*
 %{_libdir}/libxfce4panel-*.so
-%{_datadir}/gir-1.0/%{namespc}-2.0.gir
 %doc %{_datadir}/gtk-doc/html/libxfce4panel-*/
 %{_includedir}/xfce4/libxfce4panel-*/