diff --git a/graphics/py-imagecodecs/Makefile b/graphics/py-imagecodecs/Makefile
index 5070269f21fc..54e1fa2c0647 100644
--- a/graphics/py-imagecodecs/Makefile
+++ b/graphics/py-imagecodecs/Makefile
@@ -1,39 +1,47 @@
 PORTNAME=	imagecodecs
 PORTVERSION=	2024.6.1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Image transformation, compression, and decompression codecs
 WWW=		https://github.com/cgohlke/imagecodecs
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython3>=3.0:lang/cython3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libdeflate.so:archivers/libdeflate \
 		libjbig.so:graphics/jbigkit\
 		libjpegxr.so:graphics/libjxr \
 		liblcms2.so:graphics/lcms2 \
 		libLerc.so:graphics/lerc \
 		liblz4.so:archivers/liblz4 \
 		libopenjp2.so:graphics/openjpeg \
 		libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		jpeg localbase python:3.9+
 USE_PYTHON=	autoplist concurrent pep517
 
 CPPFLAGS+=	-I${LOCALBASE}/include/jxrlib -I${LOCALBASE}/include/openjpeg-2.5
 
+OPTIONS_DEFINE=	ALL
+ALL_DESC=	All optional dependencies
+
+# Remove graphics/py-tifffile from RUN_DEPENDS to avoid cyclic dependency
+ALL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}numcodecs>=0:misc/py-numcodecs@${PY_FLAVOR}
+#			${PYTHON_PKGNAMEPREFIX}tifffile>=0:graphics/py-tifffile@${PY_FLAVOR}
+
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>