diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME?=	gimp
 PORTVERSION=	2.10.32
+PORTREVISION=	1
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	GIMP/gimp/v${PORTVERSION:R}
@@ -84,7 +85,7 @@
 USES+=		desktop-file-utils
 
 OPTIONS_DEFINE?=	AALIB GHOSTSCRIPT JXL \
-			LIBHEIF LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF
+			HEIF LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF
 OPTIONS_DEFAULT=	AALIB LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF
 OPTIONS_SUB=		yes
 
@@ -112,9 +113,8 @@
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_CONFIGURE_WITH=	jpegxl
 
-LIBHEIF_DESC=		ISO/IEC 23008-12:2017 HEIF file format support
-LIBHEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
-LIBHEIF_CONFIGURE_WITH=	libheif
+HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
+HEIF_CONFIGURE_WITH=	libheif
 
 LIBMNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 LIBMNG_CONFIGURE_WITH=	libmng
diff --git a/graphics/kf5-kimageformats/Makefile b/graphics/kf5-kimageformats/Makefile
--- a/graphics/kf5-kimageformats/Makefile
+++ b/graphics/kf5-kimageformats/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kimageformats
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
@@ -16,8 +16,8 @@
 
 CFLAGS+=	-I${LOCALBASE}/include/Imath
 
-OPTIONS_DEFINE=	AVIF JXL LIBHEIF OPENEXR
-OPTIONS_DEFAULT=	AVIF JXL LIBHEIF OPENEXR
+OPTIONS_DEFINE=	AVIF JXL HEIF OPENEXR
+OPTIONS_DEFAULT=	AVIF JXL HEIF OPENEXR
 OPTIONS_SUB=	yes
 
 AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
@@ -26,9 +26,8 @@
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_CMAKE_BOOL=		KIMAGEFORMATS_JXL
 
-LIBHEIF_DESC=		ISO/IEC 23008-12:2017 HEIF file format support
-LIBHEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
-LIBHEIF_CMAKE_BOOL=	KIMAGEFORMATS_HEIF
+HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
+HEIF_CMAKE_BOOL=	KIMAGEFORMATS_HEIF
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 OPENEXR_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenEXR