diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
index 61ed15eeeaab..7216b863cf07 100644
--- a/x11/swayimg/Makefile
+++ b/x11/swayimg/Makefile
@@ -1,73 +1,71 @@
 PORTNAME=	swayimg
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.8
-PORTREVISION=	1
+DISTVERSION=	1.9
 CATEGORIES=	x11 wayland
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	2a07af9d2362.patch:-p1 # https://github.com/artemsen/swayimg/issues/37
-PATCHFILES+=	2e885eadec15.patch:-p1 # https://github.com/artemsen/swayimg/pull/36
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Image viewer for Sway/Wayland
 
 LICENSE=	MIT
 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 \
 		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 \
 		${NULL}
 
-OPTIONS_DEFINE=	AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG TIFF WEBP
-OPTIONS_DEFAULT=AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG TIFF WEBP
+OPTIONS_DEFINE=	BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 PNG TIFF WEBP ZSH
+OPTIONS_DEFAULT=BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 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
 
 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=	libwebp.so:graphics/webp
+WEBP_LIB_DEPENDS=	libwebpdemux.so:graphics/webp
 WEBP_MESON_ENABLED=	webp
 
+ZSH_MESON_ENABLED=	zsh
+ZSH_PLIST_FILES=	share/zsh/site-functions/_${PORTNAME}
+
 .include <bsd.port.mk>
diff --git a/x11/swayimg/distinfo b/x11/swayimg/distinfo
index 239f2ae457ea..351864b5a1bd 100644
--- a/x11/swayimg/distinfo
+++ b/x11/swayimg/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1659257403
-SHA256 (artemsen-swayimg-v1.8_GH0.tar.gz) = d4b4988a673522d47c38939c3406dbb72bd213f857dd6116185cd9811b887b23
-SIZE (artemsen-swayimg-v1.8_GH0.tar.gz) = 382650
-SHA256 (2a07af9d2362.patch) = 728bb4901ddea47ae023ac383aff82ccc2fa3e1ac44f1ce63bf671aaaca62952
-SIZE (2a07af9d2362.patch) = 1008
-SHA256 (2e885eadec15.patch) = 37c9f5ff44541261fd6a05c712f267d06ec767030be6526625935448777027b1
-SIZE (2e885eadec15.patch) = 1843
+TIMESTAMP = 1661767581
+SHA256 (artemsen-swayimg-v1.9_GH0.tar.gz) = 693a23a7755ebedb144271b2b674980a1c51a2036dabcff9697c3e3c6258f108
+SIZE (artemsen-swayimg-v1.9_GH0.tar.gz) = 387087