diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 7239bc32bc7c..e6b0b91ce6b6 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,76 +1,80 @@
 PORTNAME=	imlib2
 DISTVERSION=	1.12.1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	SF/enlightenment/imlib2-src/${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Next generation graphics library for Enlightenment
 WWW=		https://docs.enlightenment.org/api/imlib2/html/
 
 LICENSE=	imlib2
 LICENSE_NAME=	imlib2 license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		cpe libtool localbase:ldflags pathfix pkgconfig tar:xz
 CPE_VENDOR=	enlightenment
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
 		--enable-visibility-hiding \
 		--with-bzip2 \
 		--with-zlib
 
 INSTALL_TARGET=	install-strip
 
-CONFLICTS_INSTALL=	imlib2-webp
-
 PLIST_SUB=	SHLIB_SHORT=${DISTVERSION:R:R} \
 		SHLIB_VER=${DISTVERSION}
 
-OPTIONS_DEFINE=		GIF ID3 JPEG PNG TIFF WEBP X11
-OPTIONS_DEFAULT=	GIF ID3 JPEG PNG TIFF WEBP X11
+OPTIONS_DEFINE=		GIF ID3 JPEG JXL PNG TIFF WEBP X11
+OPTIONS_DEFAULT=	GIF ID3 JPEG JXL PNG TIFF WEBP X11
 OPTIONS_SUB=		yes
 
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_WITH=	gif
 
 ID3_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
 ID3_CONFIGURE_WITH=	id3
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
 
+JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
+JXL_CONFIGURE_WITH=	jxl
+JXL_CONFLICTS_INSTALL=	imlib2-jxl
+
 PNG_LIB_DEPENDS=	libpng16.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_WITH=	tiff
 
 WEBP_LIB_DEPENDS=	libwebpdemux.so:graphics/webp
 WEBP_CONFIGURE_WITH=	webp
+WEBP_CONFLICTS_INSTALL=	imlib2-webp
 
 X11_USES=		xorg
 X11_USE=		XORG=sm,x11,xcb,xext
 X11_CONFIGURE_WITH=	x x-shm-fd
 
 .include <bsd.port.options.mk>
 
 # scaling: MMX asm scaling causes segv, disable for now
 .if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx)
 CONFIGURE_ARGS+=	--disable-mmx
 .else
 CONFIGURE_ARGS+=	--disable-mmx
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=	--enable-amd64
 .else
 CONFIGURE_ARGS+=	--disable-amd64
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index a3460a4cc2f0..0fc4ea4a4b38 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -1,61 +1,62 @@
 %%X11%%bin/imlib2_bumpmap
 %%X11%%bin/imlib2_colorspace
 bin/imlib2_conv
 %%X11%%bin/imlib2_grab
 bin/imlib2_load
 %%X11%%bin/imlib2_poly
 %%X11%%bin/imlib2_show
 %%X11%%bin/imlib2_test
 %%X11%%bin/imlib2_view
 include/Imlib2.h
 include/Imlib2_Loader.h
 lib/imlib2/filters/bumpmap.so
 lib/imlib2/filters/colormod.so
 lib/imlib2/filters/testfilter.so
 lib/imlib2/loaders/ani.so
 lib/imlib2/loaders/argb.so
 lib/imlib2/loaders/bmp.so
 lib/imlib2/loaders/bz2.so
 lib/imlib2/loaders/ff.so
 %%GIF%%lib/imlib2/loaders/gif.so
 lib/imlib2/loaders/ico.so
 %%ID3%%lib/imlib2/loaders/id3.so
 %%JPEG%%lib/imlib2/loaders/jpeg.so
+%%JXL%%lib/imlib2/loaders/jxl.so
 lib/imlib2/loaders/lbm.so
 lib/imlib2/loaders/lzma.so
 %%PNG%%lib/imlib2/loaders/png.so
 lib/imlib2/loaders/pnm.so
 lib/imlib2/loaders/qoi.so
 lib/imlib2/loaders/tga.so
 %%TIFF%%lib/imlib2/loaders/tiff.so
 %%WEBP%%lib/imlib2/loaders/webp.so
 lib/imlib2/loaders/xbm.so
 lib/imlib2/loaders/xpm.so
 lib/imlib2/loaders/zlib.so
 lib/libImlib2.so
 lib/libImlib2.so.%%SHLIB_SHORT%%
 lib/libImlib2.so.%%SHLIB_VER%%
 libdata/pkgconfig/imlib2.pc
 %%DATADIR%%/rgb.txt
 %%DATADIR%%/data/fonts/cinema.ttf
 %%DATADIR%%/data/fonts/grunge.ttf
 %%DATADIR%%/data/fonts/morpheus.ttf
 %%DATADIR%%/data/fonts/notepad.ttf
 %%DATADIR%%/data/images/audio.png
 %%DATADIR%%/data/images/bg.png
 %%DATADIR%%/data/images/bulb.png
 %%DATADIR%%/data/images/cal.png
 %%DATADIR%%/data/images/calc.png
 %%DATADIR%%/data/images/folder.png
 %%DATADIR%%/data/images/globe.png
 %%DATADIR%%/data/images/imlib2.png
 %%DATADIR%%/data/images/lock.png
 %%DATADIR%%/data/images/mail.png
 %%DATADIR%%/data/images/menu.png
 %%DATADIR%%/data/images/mush.png
 %%DATADIR%%/data/images/paper.png
 %%DATADIR%%/data/images/sh1.png
 %%DATADIR%%/data/images/sh2.png
 %%DATADIR%%/data/images/sh3.png
 %%DATADIR%%/data/images/stop.png
 %%DATADIR%%/data/images/tnt.png