diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
index dac4cee84615..c7c3eb175fcd 100644
--- a/x11/swayimg/Makefile
+++ b/x11/swayimg/Makefile
@@ -1,11 +1,9 @@
 PORTNAME=	swayimg
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6
-PORTREVISION=	3
+DISTVERSION=	1.7
 CATEGORIES=	x11 wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	787d13e36783.patch:-p1 # https://github.com/artemsen/swayimg/pull/23
 PATCHFILES+=	d12f10e9ebbd.patch:-p1 # https://github.com/artemsen/swayimg/pull/24
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -16,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
+		libepoll-shim.so:devel/libepoll-shim \
 		libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 
diff --git a/x11/swayimg/distinfo b/x11/swayimg/distinfo
index 8f0360783fc7..fa18ba2fec2d 100644
--- a/x11/swayimg/distinfo
+++ b/x11/swayimg/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1644401520
-SHA256 (artemsen-swayimg-v1.6_GH0.tar.gz) = 944ad0c547c7fa45f26001431305529f75a8685f47e939c20442a7c16a6b22c0
-SIZE (artemsen-swayimg-v1.6_GH0.tar.gz) = 74037
-SHA256 (787d13e36783.patch) = 9b7236eb0392e430615ba306c5e15589f2eb20a89f95fa18458b4fedc1e26382
-SIZE (787d13e36783.patch) = 2021
+TIMESTAMP = 1645346183
+SHA256 (artemsen-swayimg-v1.7_GH0.tar.gz) = 2bb7bde8f993396c9f2a32c2789abdf30667f3191bf6f69f9823cdc2f06aa932
+SIZE (artemsen-swayimg-v1.7_GH0.tar.gz) = 77022
 SHA256 (d12f10e9ebbd.patch) = 682a8889be251a91f4d70d9091de880a458651a9b32788b974a1ddb4f496a27c
 SIZE (d12f10e9ebbd.patch) = 973
diff --git a/x11/swayimg/files/patch-meson.build b/x11/swayimg/files/patch-meson.build
new file mode 100644
index 000000000000..31d18e49f70e
--- /dev/null
+++ b/x11/swayimg/files/patch-meson.build
@@ -0,0 +1,21 @@
+https://github.com/artemsen/swayimg/pull/36
+
+--- meson.build.orig	2022-02-20 08:36:23 UTC
++++ meson.build
+@@ -39,6 +39,8 @@ bash  = dependency('bash-completion', required: get_op
+ # optional dependencies: other features
+ exif  = dependency('libexif', required: get_option('exif'))
+ bash  = dependency('bash-completion', required: get_option('bash'))
++# Non-Linux
++epoll = dependency('epoll-shim', required: false)
+ 
+ # configuration file
+ conf = configuration_data()
+@@ -150,6 +152,7 @@ executable(
+   dependencies: [
+     avif,
+     cairo,
++    epoll,
+     exif,
+     gif,
+     jpeg,