diff --git a/x11/xfce4-garcon/Makefile b/x11/xfce4-garcon/Makefile
index b3288e2efe94..028ed3689e6e 100644
--- a/x11/xfce4-garcon/Makefile
+++ b/x11/xfce4-garcon/Makefile
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.25 2020/08/31 18:13:26 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2021/11/30 14:19:06 gutteridge Exp $
 
-PKGREVISION= 2
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-VERSION=	0.7.0
+VERSION=	4.16.1
 DISTNAME=	garcon-${VERSION}
 PKGNAME=	xfce4-garcon-${VERSION}
 CATEGORIES=	x11
-MASTER_SITES=	http://archive.xfce.org/src/xfce/garcon/${VERSION:R}/
+MASTER_SITES=	https://archive.xfce.org/src/xfce/garcon/${VERSION:R}/
 
 HOMEPAGE=	https://wiki.xfce.org/dev/garcon
 COMMENT=	Xfce menu library
 
 PKGCONFIG_OVERRIDE=	garcon/garcon-1.pc.in
-PKGCONFIG_OVERRIDE=	garcon/garcon-2.pc.in
-PKGCONFIG_OVERRIDE+=	garcon-gtk/garcon-gtk2.pc.in
-PKGCONFIG_OVERRIDE+=	garcon-gtk/garcon-gtk3.pc.in
+PKGCONFIG_OVERRIDE+=	garcon-gtk/garcon-gtk3-1.pc.in
 
 EGDIR=			${XFCE4_EGBASE}
 PKG_SYSCONFSUBDIR=	xdg
@@ -24,7 +21,5 @@ MAKE_DIRS+=		${EGDIR} ${EGDIR}/menus ${PKG_SYSCONFDIR}/menus
 CONF_FILES=		${EGDIR}/menus/xfce-applications.menu \
 			${PKG_SYSCONFDIR}/menus/xfce-applications.menu
 
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libxfce4ui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-garcon/PLIST b/x11/xfce4-garcon/PLIST
index 91985fe4af75..1e72378cdf31 100644
--- a/x11/xfce4-garcon/PLIST
+++ b/x11/xfce4-garcon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2020/04/05 22:59:00 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/11/30 14:19:06 gutteridge Exp $
 include/garcon-1/garcon/garcon-config.h
 include/garcon-1/garcon/garcon-environment.h
 include/garcon-1/garcon/garcon-marshal.h
@@ -15,15 +15,11 @@ include/garcon-1/garcon/garcon-menu-separator.h
 include/garcon-1/garcon/garcon-menu-tree-provider.h
 include/garcon-1/garcon/garcon-menu.h
 include/garcon-1/garcon/garcon.h
-include/garcon-gtk2-1/garcon-gtk/garcon-gtk-menu.h
-include/garcon-gtk2-1/garcon-gtk/garcon-gtk.h
 include/garcon-gtk3-1/garcon-gtk/garcon-gtk-menu.h
 include/garcon-gtk3-1/garcon-gtk/garcon-gtk.h
 lib/libgarcon-1.la
-lib/libgarcon-gtk2-1.la
 lib/libgarcon-gtk3-1.la
 lib/pkgconfig/garcon-1.pc
-lib/pkgconfig/garcon-gtk2-1.pc
 lib/pkgconfig/garcon-gtk3-1.pc
 share/desktop-directories/xfce-accessories.directory
 share/desktop-directories/xfce-development.directory
@@ -74,6 +70,7 @@ share/gtk-doc/html/garcon/right.png
 share/gtk-doc/html/garcon/style.css
 share/gtk-doc/html/garcon/up-insensitive.png
 share/gtk-doc/html/garcon/up.png
+share/icons/hicolor/32x32/apps/org.xfce.garcon.png
 share/locale/am/LC_MESSAGES/garcon.mo
 share/locale/ar/LC_MESSAGES/garcon.mo
 share/locale/ast/LC_MESSAGES/garcon.mo
@@ -101,12 +98,14 @@ share/locale/hr/LC_MESSAGES/garcon.mo
 share/locale/hu/LC_MESSAGES/garcon.mo
 share/locale/hy/LC_MESSAGES/garcon.mo
 share/locale/hy_AM/LC_MESSAGES/garcon.mo
+share/locale/hye/LC_MESSAGES/garcon.mo
 share/locale/id/LC_MESSAGES/garcon.mo
 share/locale/ie/LC_MESSAGES/garcon.mo
 share/locale/is/LC_MESSAGES/garcon.mo
 share/locale/it/LC_MESSAGES/garcon.mo
 share/locale/ja/LC_MESSAGES/garcon.mo
 share/locale/ka/LC_MESSAGES/garcon.mo
+share/locale/kab/LC_MESSAGES/garcon.mo
 share/locale/kk/LC_MESSAGES/garcon.mo
 share/locale/ko/LC_MESSAGES/garcon.mo
 share/locale/lt/LC_MESSAGES/garcon.mo
diff --git a/x11/xfce4-garcon/distinfo b/x11/xfce4-garcon/distinfo
index ee9a92525f69..f8f88f89b882 100644
--- a/x11/xfce4-garcon/distinfo
+++ b/x11/xfce4-garcon/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 11:34:46 nia Exp $
+$NetBSD: distinfo,v 1.12 2021/11/30 14:19:06 gutteridge Exp $
 
-BLAKE2s (garcon-0.7.0.tar.bz2) = e73a3a9a16edf9486fa730897df2a6a30e7477fa1549cdefa272a413613ef8fa
-SHA512 (garcon-0.7.0.tar.bz2) = e865f68fe595bbc22d023d72ce4663c75e837a6789eb2158747e2cb7420ea2bba06dfd660e1de20675b9f9057cb2a9c1dc24221de8be93882e9b29bffb1fce37
-Size (garcon-0.7.0.tar.bz2) = 508624 bytes
+BLAKE2s (garcon-4.16.1.tar.bz2) = 42458f4b925411b8ff84a5e31feb49a637cf1d0dcef2fb129936b81d0fcd5bb1
+SHA512 (garcon-4.16.1.tar.bz2) = 07391e72dceebd0f584beb3f9ca954bd7dc8a078a83d1025b0abf7a439bf56a98e8825868530c47f0ee8411b69bbc1f6c4127f5ea5253ecf8de259056112b42b
+Size (garcon-4.16.1.tar.bz2) = 520220 bytes
 SHA1 (patch-data_xfce_Makefile.in) = 80264dc6736b1be4ff64f135107b8dff9100a097
 SHA1 (patch-garcon-gtk_Makefile.am) = ec605a013e2e3494f68903806ab6af56be3f33e8
 SHA1 (patch-garcon_Makefile.in) = 875699bf7dfa7138712caa93c2bf5be2f07841ed