diff --git a/x11-wm/mango/Makefile b/x11-wm/mango/Makefile
index 169549aba8f8..34ceea75e4c1 100644
--- a/x11-wm/mango/Makefile
+++ b/x11-wm/mango/Makefile
@@ -1,50 +1,46 @@
 PORTNAME=	mango
-DISTVERSION=	0.14.4
+DISTVERSION=	0.16.3
 PORTREVISION=	0
 CATEGORIES=	x11-wm
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Lightweight, high-performance Wayland compositor built on dwl
 WWW=		https://mangowm.github.io/
 
-LICENSE=	CC0-1.0 GPLv3 MIT
-LICENSE_COMB=	multi
-LICENSE_FILE_CC0-1.0=	${WRKSRC}/LICENSE.tinywl
-LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE.dwl
-LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.wlroots
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	hwdata>=0.399:misc/hwdata \
 		wayland-protocols>=1.24:graphics/wayland-protocols
 LIB_DEPENDS=	libcjson.so:devel/libcjson \
 		libinput.so:x11/libinput \
 		libpcre2-8.so:devel/pcre2 \
 		libpixman-1.so:x11/pixman \
-		libscenefx-0.4.so:x11-toolkits/scenefx04 \
-		libwlroots-0.19.so:x11-toolkits/wlroots019 \
+		libscenefx-0.5.so:x11-toolkits/scenefx05 \
+		libwayland-server.so:graphics/wayland \
+		libwlroots-0.20.so:x11-toolkits/wlroots020 \
 		libxcb-icccm.so:x11/xcb-util-wm \
-		libxkbcommon.so:x11/libxkbcommon \
-		libwayland-server.so:graphics/wayland
-
+		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	hwdata>=0.399:misc/hwdata \
 		Xwayland:x11-servers/xwayland
 
-USES=		meson pkgconfig
-
+USES=		gnome meson pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	mangowm
+USE_GNOME=	cairo glib20 pango
 
 MESON_ARGS=	-Dsysconfdir=${PREFIX}/etc
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -E -e "s|(assets/(config.conf))|\1', rename : '\2.sample|1" \
 		${WRKSRC}/meson.build
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/x11-wm/mango/distinfo b/x11-wm/mango/distinfo
index 638ec865fb70..c2806a8a854a 100644
--- a/x11-wm/mango/distinfo
+++ b/x11-wm/mango/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1781598586
-SHA256 (mangowm-mango-0.14.4_GH0.tar.gz) = e37e732ff3b0db309fc616cec5ed9699e972f2969f82c1bbc3c5a298168401f8
-SIZE (mangowm-mango-0.14.4_GH0.tar.gz) = 506823
+TIMESTAMP = 1788557425
+SHA256 (mangowm-mango-0.16.3_GH0.tar.gz) = a1db5ca86c7f7af9514f3e91e760aeb3734f3a8f60e86637d8a92d9c5c1bab76
+SIZE (mangowm-mango-0.16.3_GH0.tar.gz) = 545032
diff --git a/x11-wm/mango/files/patch-src_dispatch_bind__define.h b/x11-wm/mango/files/patch-src_dispatch_bind__define.h
new file mode 100644
index 000000000000..9b487c8d61f8
--- /dev/null
+++ b/x11-wm/mango/files/patch-src_dispatch_bind__define.h
@@ -0,0 +1,11 @@
+--- src/dispatch/bind_define.h.orig	2026-09-04 03:02:04 UTC
++++ src/dispatch/bind_define.h
+@@ -1111,7 +1111,7 @@ static void close_inherited_fds(void) {
+ 
+ static void close_inherited_fds(void) {
+ #ifdef SYS_close_range
+-	extern long syscall(long number, ...);
++	extern int syscall(int number, ...);
+ 	if (syscall(SYS_close_range, 3, ~0U, 0) == 0)
+ 		return;
+ #endif
diff --git a/x11-wm/mango/files/patch-src_mango.c b/x11-wm/mango/files/patch-src_mango.c
index 140092f4865f..74928770b279 100644
--- a/x11-wm/mango/files/patch-src_mango.c
+++ b/x11-wm/mango/files/patch-src_mango.c
@@ -1,14 +1,14 @@
---- src/mango.c.orig	2026-05-29 13:04:35 UTC
+--- src/mango.c.orig	2026-08-27 06:44:37 UTC
 +++ src/mango.c
-@@ -7,7 +7,11 @@
+@@ -9,7 +9,11 @@
  #include <getopt.h>
  #include <libinput.h>
  #include <limits.h>
 +#ifdef __FreeBSD__
 +#include <dev/evdev/input-event-codes.h>
 +#else
  #include <linux/input-event-codes.h>
 +#endif
+ #include <math.h>
  #include <scenefx/render/fx_renderer/fx_renderer.h>
  #include <scenefx/types/fx/blur_data.h>
- #include <scenefx/types/fx/clipped_region.h>
diff --git a/x11-wm/mango/files/pkg-message.in b/x11-wm/mango/files/pkg-message.in
index 07378ce37e8b..066e526ec2fd 100644
--- a/x11-wm/mango/files/pkg-message.in
+++ b/x11-wm/mango/files/pkg-message.in
@@ -1,36 +1,57 @@
 [
 { type: install
   message: <<EOM
 Before using Mango run the following commands as user:
 
     mkdir -p ~/.config/mango
     cp %%PREFIX%%/etc/mango/config.conf ~/.config/mango/
 
 then customize that file, in particular the variable
 
     xkb_rules_layout
 
 and the keyboard shortcut to launch a terminal
 
     bind=Alt,Return,spawn,foot
 
 (replace foot with your preferred terminal emulator).
+
+N.B. If you use x11/waybar, version 0.15.0, you have to consider (temporarily)
+other alternatives like x11/sfwbar or x11/mangobar, because that version is not
+compatible with the current version of Mango.
 EOM
 }
 { type: upgrade
   maximum_version: "0.14.0"
   message: <<EOM
   Version 0.14.0 of Mango has some breaking changes:
 
   - IPC Protocol Upgrade: The old dwl IPC protocol is now deprecated and will
     be removed in the next version.
   - Socket Restructuring: mmsg(1) now restricts the use of independent sockets.
     This structural change delivers a more powerful, concise, and reliable
     syntax, allowing you to seamlessly retrieve data for all clients, tags,
     monitors, and messages.
 
   As a result, you must adapt any script that uses the mmsg(1) command to
   the new syntax.
 EOM
 }
+{ type: upgrade
+  maximum_version: "0.16.3"
+  message: <<EOM
+  Version 0.16.3 of Mango has some breaking changes. More details at these
+addresses:
+
+  1. https://github.com/mangowm/mango/releases/tag/0.15.0
+  2. https://github.com/mangowm/mango/releases/tag/0.15.5
+  3. https://github.com/mangowm/mango/releases/tag/0.16.0
+  4. https://github.com/mangowm/mango/releases/tag/0.16.1
+  5. https://github.com/mangowm/mango/releases/tag/0.16.3
+
+In particular, if you use x11/waybar, version 0.15.0, you have to consider
+(temporarily) other alternatives like x11/sfwbar or x11/mangobar, because
+that version is not compatible with the current version of Mango.
+EOM
+}
 ]
diff --git a/x11-wm/mango/pkg-plist b/x11-wm/mango/pkg-plist
index 4a2609f090ea..468e64ac1ea9 100644
--- a/x11-wm/mango/pkg-plist
+++ b/x11-wm/mango/pkg-plist
@@ -1,37 +1,38 @@
 bin/mango
 bin/mmsg
 %%ETCDIR%%/config.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/bindings/index.mdx
 %%PORTDOCS%%%%DOCSDIR%%/bindings/keys.md
 %%PORTDOCS%%%%DOCSDIR%%/bindings/meta.json
 %%PORTDOCS%%%%DOCSDIR%%/bindings/mouse-gestures.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/basics.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/index.mdx
 %%PORTDOCS%%%%DOCSDIR%%/configuration/input.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/meta.json
 %%PORTDOCS%%%%DOCSDIR%%/configuration/miscellaneous.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/monitors.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/xdg-portals.md
 %%PORTDOCS%%%%DOCSDIR%%/faq.md
 %%PORTDOCS%%%%DOCSDIR%%/index.md
 %%PORTDOCS%%%%DOCSDIR%%/installation.md
 %%PORTDOCS%%%%DOCSDIR%%/ipc.md
 %%PORTDOCS%%%%DOCSDIR%%/meta.json
 %%PORTDOCS%%%%DOCSDIR%%/nix-options.md
+%%PORTDOCS%%%%DOCSDIR%%/patches/v0.15.0/configuration/monitors.md
 %%PORTDOCS%%%%DOCSDIR%%/quick-start.md
 %%PORTDOCS%%%%DOCSDIR%%/screenshot.md
 %%PORTDOCS%%%%DOCSDIR%%/visuals/animations.md
 %%PORTDOCS%%%%DOCSDIR%%/visuals/effects.md
 %%PORTDOCS%%%%DOCSDIR%%/visuals/index.mdx
 %%PORTDOCS%%%%DOCSDIR%%/visuals/meta.json
 %%PORTDOCS%%%%DOCSDIR%%/visuals/status-bar.md
 %%PORTDOCS%%%%DOCSDIR%%/visuals/theming.md
 %%PORTDOCS%%%%DOCSDIR%%/window-management/index.mdx
 %%PORTDOCS%%%%DOCSDIR%%/window-management/layouts.md
 %%PORTDOCS%%%%DOCSDIR%%/window-management/meta.json
 %%PORTDOCS%%%%DOCSDIR%%/window-management/overview.md
 %%PORTDOCS%%%%DOCSDIR%%/window-management/rules.md
 %%PORTDOCS%%%%DOCSDIR%%/window-management/scratchpad.md
 share/man/man1/mmsg.1.gz
 share/wayland-sessions/mango.desktop
 share/xdg-desktop-portal/mango-portals.conf