diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index 0f3c9516559a..fcf42b231ba8 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -1,71 +1,74 @@
 
 PORTNAME=	sway
 DISTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
 PATCHFILES+=	f98ca3ab7ca1.patch:-p1 # https://github.com/swaywm/sway/pull/5090
 PATCHFILES+=	968c005760b6.patch:-p1 # https://github.com/swaywm/sway/pull/5856
 PATCHFILES+=	fdbe98512a71.patch:-p1 # https://github.com/swaywm/sway/pull/5856
 PATCHFILES+=	a52176f83035.patch:-p1 # https://github.com/swaywm/sway/pull/5856
 PATCHFILES+=	c9fe0626ca73.patch:-p1 # https://github.com/swaywm/sway/pull/5891
+PATCHFILES+=	1a6471be172f.patch:-p1 # https://github.com/swaywm/sway/pull/6046
+PATCHFILES+=	79e43b19d795.patch:-p1 # https://github.com/swaywm/sway/pull/6046
+PATCHFILES+=	e7af5b630916.patch:-p1 # https://github.com/swaywm/sway/pull/6046
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	i3-compatible Wayland compositor
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
 		wlroots>=0.12.0<0.13.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libevdev.so:devel/libevdev \
 		libpcre.so:devel/pcre \
 		libwayland-egl.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	swaybg:x11/swaybg
 
 USES=		compiler:c11 gl gnome meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		glesv2
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 GH_ACCOUNT=	swaywm
 MESON_ARGS=	-Dsd-bus-provider=basu
 
 OPTIONS_DEFINE=	BASU MANPAGES PIXBUF SUID X11
 OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SUID X11
 OPTIONS_SUB=	yes
 
 BASU_DESC=		Tray in swaybar via basu
 BASU_LIB_DEPENDS=	libbasu.so:devel/basu
 BASU_MESON_ENABLED=	tray
 
 MANPAGES_BUILD_DEPENDS=	scdoc>=1.9.2:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 
 PIXBUF_USE=		GNOME=gdkpixbuf2
 PIXBUF_MESON_ENABLED=	gdk-pixbuf
 
 SUID_DESC=		setuid bit on "sway" binary (to claim DRM without seatd/console-kit-daemon)
 SUID_PLIST_SUB=		MAYBE_SUID="@(,,4755) "
 SUID_PLIST_SUB_OFF=	MAYBE_SUID=""
 
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
 
 post-patch:
 # Let @sample handle default files under etc/
 	@${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \
 		${WRKSRC}/meson.build
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo
index 8d16ea61f70f..de87c59abf6a 100644
--- a/x11-wm/sway/distinfo
+++ b/x11-wm/sway/distinfo
@@ -1,15 +1,21 @@
 TIMESTAMP = 1605026851
 SHA256 (swaywm-sway-1.5.1_GH0.tar.gz) = 095f983c9a5f80d761bc2fb19df8166839b9290124ccd47f3e74119a1335490f
 SIZE (swaywm-sway-1.5.1_GH0.tar.gz) = 5536721
 SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d
 SIZE (cd9d1038a822.patch) = 8968
 SHA256 (f98ca3ab7ca1.patch) = b3a427b6edbf1c89bbf5fdeb5e3fc4c6708478e6d2031fcead87d29bf5c409fa
 SIZE (f98ca3ab7ca1.patch) = 2673
 SHA256 (968c005760b6.patch) = 23143055d2c65ef6fb4b3569d0289cd9f0014d7370e102fc7858900b534b4fad
 SIZE (968c005760b6.patch) = 2547
 SHA256 (fdbe98512a71.patch) = eafb176b4403f66dafbfd285387cb954ce4b112c940987fe8cab9abbf430b145
 SIZE (fdbe98512a71.patch) = 5035
 SHA256 (a52176f83035.patch) = 503f0ce5699799b82332a414d76b2148d53d1066a1e77ff24b0d42464c2c25cf
 SIZE (a52176f83035.patch) = 2588
 SHA256 (c9fe0626ca73.patch) = 4f6005a1f7c9b454ab6e7c85a01b44c27cc5f2641e58bb220220fdceb7b111cb
 SIZE (c9fe0626ca73.patch) = 913
+SHA256 (1a6471be172f.patch) = d825b90b3c3e9bc98f1b84bef668fc7e9c2ca22f37e5faeeb7f104e49d09ae9c
+SIZE (1a6471be172f.patch) = 2037
+SHA256 (79e43b19d795.patch) = 0591e0467bf2ccd8cded9851e2a87ad831e183dd6a79fff86a9205c0eeee14f0
+SIZE (79e43b19d795.patch) = 1001
+SHA256 (e7af5b630916.patch) = 9ff1b9093fccdc34cd8dab97a60f54abd2c34af5b00925ca6f573a462ad1f141
+SIZE (e7af5b630916.patch) = 1395