diff --git a/profiles/package.mask b/profiles/package.mask
index f164bde35b586..8ef5338a942e6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -220,7 +220,7 @@ app-office/orage
 xfce-extra/multiload-nandhp
 xfce-extra/xfce4-embed-plugin
 xfce-extra/xfce4-equake-plugin
-xfce-extra/xfce4-kbdleds-plugin
+<xfce-extra/xfce4-kbdleds-plugin-0.2.3
 xfce-extra/xfce4-windowck-plugin
 
 # Michał Górny <mgorny@gentoo.org> (2021-02-07)
diff --git a/xfce-extra/xfce4-kbdleds-plugin/Manifest b/xfce-extra/xfce4-kbdleds-plugin/Manifest
index df2602eb17e29..3203283f58c09 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/Manifest
+++ b/xfce-extra/xfce4-kbdleds-plugin/Manifest
@@ -1 +1,2 @@
 DIST xfce4-kbdleds-plugin-0.0.6.tar.bz2 265889 BLAKE2B 1b166dce725f92fe05273d427dd4d185e6a240c984e4e2503f092af222e7a08b8697b8031804490322bb156bc5109c82f38273278fff185a9039b26334541ef2 SHA512 2cc48ec04d24ff55900c511c1fbe3ce1f7c45e59a30098a3b8af292ff5b219e7050e81d22f449f77ac79129b63db20ea61cb49730c5092583b935190149e127f
+DIST xfce4-kbdleds-plugin-0.2.3.tar.bz2 321690 BLAKE2B 847bbf675b97659c86c0668ab9ce96787866734377f3fdb49d4b5f18a3735cace66279783df92fe8cfff57ff05f4f09fa3fff23e0dc89f1b2d0fbd512e5089f5 SHA512 ddedaf430226f77d03f63f4dc31518184fd808d01c6049adbf41cacc2f46c78c3ce48c5a0450c200acda4a328d9716d54f7cc225913f4761a0526710b76f0cee
diff --git a/xfce-extra/xfce4-kbdleds-plugin/files/xfce4-kbdleds-plugin-0.2.3-xfce-4.16.patch b/xfce-extra/xfce4-kbdleds-plugin/files/xfce4-kbdleds-plugin-0.2.3-xfce-4.16.patch
new file mode 100644
index 0000000000000..8b69a019a0aea
--- /dev/null
+++ b/xfce-extra/xfce4-kbdleds-plugin/files/xfce4-kbdleds-plugin-0.2.3-xfce-4.16.patch
@@ -0,0 +1,44 @@
+diff --git a/panel-plugin/kbdleds-dialogs.c b/panel-plugin/kbdleds-dialogs.c
+index 7f751f3ef446..7e4125f2be22 100644
+--- a/panel-plugin/kbdleds-dialogs.c
++++ b/panel-plugin/kbdleds-dialogs.c
+@@ -25,7 +25,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4ui/libxfce4ui.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ #include "kbdleds.h"
+ #include "kbdleds-dialogs.h"
+diff --git a/panel-plugin/kbdleds.c b/panel-plugin/kbdleds.c
+index 9c78d402b1c7..502a2885bcea 100644
+--- a/panel-plugin/kbdleds.c
++++ b/panel-plugin/kbdleds.c
+@@ -28,7 +28,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ #include "kbdleds.h"
+ #include "kbdleds-dialogs.h"
+@@ -140,7 +140,7 @@ kbdleds_new (XfcePanelPlugin *plugin)
+   GtkWidget      *label;
+ 
+   /* allocate memory for the plugin structure */
+-  kbdleds = panel_slice_new0 (kbdledsPlugin);
++  kbdleds = g_slice_new0 (kbdledsPlugin);
+ 
+   /* pointer to plugin */
+   kbdleds->plugin = plugin;
+@@ -187,7 +187,7 @@ kbdleds_free (XfcePanelPlugin *plugin,
+     //g_free (kbdleds->setting1);
+ 
+   /* free the plugin structure */
+-  panel_slice_free (kbdledsPlugin, kbdleds);
++  g_slice_free (kbdledsPlugin, kbdleds);
+ 
+   /* free the timeout */
+   if (timeoutId) {
diff --git a/xfce-extra/xfce4-kbdleds-plugin/metadata.xml b/xfce-extra/xfce4-kbdleds-plugin/metadata.xml
index 359901b31db49..c61af41106edd 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/metadata.xml
+++ b/xfce-extra/xfce4-kbdleds-plugin/metadata.xml
@@ -5,4 +5,7 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">oco2000/xfce4-kbdleds-plugin</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.2.3.ebuild b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.2.3.ebuild
new file mode 100644
index 0000000000000..df771dd85935d
--- /dev/null
+++ b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.2.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A panel plug-in to show state of Caps, Num and Scroll Lock keys"
+HOMEPAGE="https://github.com/oco2000/xfce4-kbdleds-plugin"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	xfce-base/libxfce4ui:=
+	xfce-base/libxfce4util:=
+	xfce-base/xfce4-panel"
+DEPEND=${RDEPEND}
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+# https://github.com/oco2000/xfce4-kbdleds-plugin/pull/7
+PATCHES=( "${FILESDIR}/${P}-xfce-4.16.patch" )
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}