diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
index c7cee9907723..7d88f42cf980 100644
--- a/x11/swayimg/Makefile
+++ b/x11/swayimg/Makefile
@@ -1,87 +1,96 @@
 PORTNAME=	swayimg
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.12
-PORTREVISION=	3
+DISTVERSION=	2.0
 CATEGORIES=	x11 wayland
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	d38e5f7de3ca.patch:-p1 # https://github.com/artemsen/swayimg/pull/106
+PATCHFILES+=	94a31b9f22f6.patch:-p1 # https://github.com/artemsen/swayimg/pull/106
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Image viewer for Sway/Wayland
 WWW=		https://github.com/artemsen/swayimg
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
+		libinotify.so:devel/libinotify \
 		libwayland-client.so:graphics/wayland \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		meson pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	artemsen
 MESON_ARGS=	-Dversion="${DISTVERSIONFULL}"
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz \
 		man/man5/${PORTNAME}rc.5.gz \
 		share/applications/${PORTNAME}.desktop \
 		share/icons/hicolor/64x64/apps/${PORTNAME}.png \
+		${DATADIR}/swayimgrc \
 		${NULL}
 
 # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31
 # https://cgit.freebsd.org/src/commit/?id=af93fea71038
 .if !exists(/usr/include/sys/timerfd.h)
 LIB_DEPENDS+=	libepoll-shim.so:devel/libepoll-shim
 .endif
 
-OPTIONS_DEFINE=	BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 OPENEXR PNG TIFF WEBP ZSH
-OPTIONS_DEFAULT=BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 OPENEXR PNG TIFF WEBP ZSH
+OPTIONS_DEFINE=	AVIF BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 OPENEXR PNG TIFF WEBP ZSH
+OPTIONS_DEFAULT=AVIF BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 OPENEXR PNG TIFF WEBP ZSH
 OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/}
 
+AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
+AVIF_MESON_ENABLED=	avif
+
 BASH_BUILD_DEPENDS=	bash-completion>0:shells/bash-completion
 BASH_MESON_ENABLED=	bash
 BASH_PLIST_FILES=	share/bash-completion/completions/${PORTNAME}
 
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_USES=		localbase:ldflags
 GIF_MESON_ENABLED=	gif
 
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 HEIF_MESON_ENABLED=	heif
 
 JPEG_USES=		jpeg
 JPEG_MESON_ENABLED=	jpeg
 
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_MESON_ENABLED=	jxl
 
 LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_MESON_ENABLED=	exif
 
 LIBRSVG2_USES=		gnome
 LIBRSVG2_USE=		GNOME=cairo,librsvg2
 LIBRSVG2_MESON_ENABLED=	svg
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 OPENEXR_MESON_ENABLED=	exr
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MESON_ENABLED=	png
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_MESON_ENABLED=	tiff
 
 WEBP_LIB_DEPENDS=	libwebpdemux.so:graphics/webp
 WEBP_MESON_ENABLED=	webp
 
 ZSH_MESON_ENABLED=	zsh
 ZSH_PLIST_FILES=	share/zsh/site-functions/_${PORTNAME}
 
 post-patch:
 # Respect PREFIX for system-wide config
 	@${REINPLACE_CMD} 's,/etc,${PREFIX}&,' \
+		${WRKSRC}/extra/${PORTNAME}rc \
 		${WRKSRC}/extra/${PORTNAME}rc.5 \
 		${WRKSRC}/src/config.c
 
 .include <bsd.port.mk>
diff --git a/x11/swayimg/distinfo b/x11/swayimg/distinfo
index 0cd0a36694c6..6cb15ff3598e 100644
--- a/x11/swayimg/distinfo
+++ b/x11/swayimg/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1688363467
-SHA256 (artemsen-swayimg-v1.12_GH0.tar.gz) = 4617322a1ec17985770dc351eea69b42b1464f2d838eb5015314634b2a30f126
-SIZE (artemsen-swayimg-v1.12_GH0.tar.gz) = 395978
+TIMESTAMP = 1704275136
+SHA256 (artemsen-swayimg-v2.0_GH0.tar.gz) = afcf69d9c69d826e010065dd08732fc5b0c0402c26f98d977f27b77ebd2bdee1
+SIZE (artemsen-swayimg-v2.0_GH0.tar.gz) = 404401
+SHA256 (d38e5f7de3ca.patch) = aa02fa9758fa02b22fa8f27b9798b47c8e0c494b5fbb0c3355bf42e0e82c3c5e
+SIZE (d38e5f7de3ca.patch) = 923
+SHA256 (94a31b9f22f6.patch) = cb26c477236680af3b203d481492093e695e0b2c6f8c3cd262ed82e39eba38ca
+SIZE (94a31b9f22f6.patch) = 1936