diff --git a/graphics/kf6-kimageformats/Makefile b/graphics/kf6-kimageformats/Makefile
index 486c61aae2d5..706109823369 100644
--- a/graphics/kf6-kimageformats/Makefile
+++ b/graphics/kf6-kimageformats/Makefile
@@ -1,33 +1,36 @@
 PORTNAME=	kimageformats
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	graphics kde kde-frameworks
 
 COMMENT=	Plugins to allow QImage to support extra file formats
 MAINTAINER=	kde@FreeBSD.org
 
 USES=		cmake gl kde:6 pkgconfig qt:6 tar:xz
 USE_GL=		gl opengl
 USE_KDE=	archive ecm:build
 USE_QT=		base
 
-OPTIONS_DEFINE=	AVIF JXL HEIF OPENEXR RAW
-OPTIONS_DEFAULT=	AVIF JXL HEIF OPENEXR RAW
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		AVIF JXL HEIF OPENEXR OPENJPEG RAW
+OPTIONS_DEFAULT:=	${OPTIONS_DEFINE}
+OPTIONS_SUB=		yes
 
 AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
 AVIF_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_libavif
 
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_CMAKE_BOOL=		KIMAGEFORMATS_JXL
 
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 HEIF_CMAKE_BOOL=	KIMAGEFORMATS_HEIF
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
 			libImath.so:math/Imath
 OPENEXR_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
 
+OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
+OPENJPEG_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenJPEG
+
 RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
-RAW_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_libraw
+RAW_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_LibRaw
 
 .include <bsd.port.mk>
diff --git a/graphics/kf6-kimageformats/pkg-plist b/graphics/kf6-kimageformats/pkg-plist
index c6220810c367..cbc86f2543d0 100644
--- a/graphics/kf6-kimageformats/pkg-plist
+++ b/graphics/kf6-kimageformats/pkg-plist
@@ -1,26 +1,26 @@
 lib/cmake/KF6ImageFormats/KF6ImageFormatsConfig.cmake
 lib/cmake/KF6ImageFormats/KF6ImageFormatsConfigVersion.cmake
 %%QT_PLUGINDIR%%/imageformats/kimg_ani.so
 %%AVIF%%%%QT_PLUGINDIR%%/imageformats/kimg_avif.so
 %%QT_PLUGINDIR%%/imageformats/kimg_dds.so
 %%QT_PLUGINDIR%%/imageformats/kimg_eps.so
 %%OPENEXR%%%%QT_PLUGINDIR%%/imageformats/kimg_exr.so
 %%QT_PLUGINDIR%%/imageformats/kimg_hdr.so
 %%HEIF%%%%QT_PLUGINDIR%%/imageformats/kimg_heif.so
 %%QT_PLUGINDIR%%/imageformats/kimg_iff.so
-%%QT_PLUGINDIR%%/imageformats/kimg_jp2.so
+%%OPENJPEG%%%%QT_PLUGINDIR%%/imageformats/kimg_jp2.so
 %%JXL%%%%QT_PLUGINDIR%%/imageformats/kimg_jxl.so
 %%QT_PLUGINDIR%%/imageformats/kimg_kra.so
 %%QT_PLUGINDIR%%/imageformats/kimg_ora.so
 %%QT_PLUGINDIR%%/imageformats/kimg_pcx.so
 %%QT_PLUGINDIR%%/imageformats/kimg_pfm.so
 %%QT_PLUGINDIR%%/imageformats/kimg_pic.so
 %%QT_PLUGINDIR%%/imageformats/kimg_psd.so
 %%QT_PLUGINDIR%%/imageformats/kimg_pxr.so
 %%QT_PLUGINDIR%%/imageformats/kimg_qoi.so
 %%QT_PLUGINDIR%%/imageformats/kimg_ras.so
 %%RAW%%%%QT_PLUGINDIR%%/imageformats/kimg_raw.so
 %%QT_PLUGINDIR%%/imageformats/kimg_rgb.so
 %%QT_PLUGINDIR%%/imageformats/kimg_sct.so
 %%QT_PLUGINDIR%%/imageformats/kimg_tga.so
 %%QT_PLUGINDIR%%/imageformats/kimg_xcf.so