diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index f4c8b7119511..635c491ea844 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	tiff
 DISTVERSION=	4.7.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://download.osgeo.org/libtiff/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Tools and library routines for working with TIFF images
 WWW=		http://www.simplesystems.org/libtiff/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libdeflate.so:archivers/libdeflate \
 		libjbig.so:graphics/jbigkit \
 		libLerc.so:graphics/lerc \
 		libzstd.so:archivers/zstd
 
 USES=		cmake:testing cpe jpeg pathfix pkgconfig tar:xz
 CPE_PRODUCT=	libtiff
 PATHFIX_CMAKELISTSTXT=	PkgConfig.cmake
 USE_LDCONFIG=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/tiff-${DISTVERSION}
 
 CMAKE_TESTING_ON=	tiff-tests
 
 CMAKE_OFF=	tiff-docs \
 		tiff-tests
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_GLUT \
 		CMAKE_DISABLE_FIND_PACKAGE_OpenGL \
 		CMAKE_DISABLE_FIND_PACKAGE_WebP
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man-prebuilt/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/man-prebuilt/*.3tiff ${STAGEDIR}${PREFIX}/share/man/man3
 
 post-install-DOCS-on:
 	(cd ${WRKSRC}/doc/html-prebuilt && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/manual)
 	${INSTALL_MAN} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/LICENSE.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/RELEASE-DATE ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/VERSION ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/tiff/files/patch-libtiff_tif__getimage.c b/graphics/tiff/files/patch-libtiff_tif__getimage.c
new file mode 100644
index 000000000000..c3c3ed3a62a0
--- /dev/null
+++ b/graphics/tiff/files/patch-libtiff_tif__getimage.c
@@ -0,0 +1,38 @@
+--- libtiff/tif_getimage.c.orig	2025-06-25 17:20:35 UTC
++++ libtiff/tif_getimage.c
+@@ -2216,7 +2216,7 @@ DECLAREContigPutFunc(putcontig8bitYCbCr44tile)
+     uint32_t *cp1 = cp + w + toskew;
+     uint32_t *cp2 = cp1 + w + toskew;
+     uint32_t *cp3 = cp2 + w + toskew;
+-    int32_t incr = 3 * w + 4 * toskew;
++    const tmsize_t incr = 3 * (tmsize_t)w + 4 * (tmsize_t)toskew;
+ 
+     (void)y;
+     /* adjust fromskew */
+@@ -2356,7 +2356,7 @@ DECLAREContigPutFunc(putcontig8bitYCbCr42tile)
+ DECLAREContigPutFunc(putcontig8bitYCbCr42tile)
+ {
+     uint32_t *cp1 = cp + w + toskew;
+-    int32_t incr = 2 * toskew + w;
++    const tmsize_t incr = 2 * (tmsize_t)toskew + w;
+ 
+     (void)y;
+     fromskew = (fromskew / 4) * (4 * 2 + 2);
+@@ -2512,7 +2512,7 @@ DECLAREContigPutFunc(putcontig8bitYCbCr22tile)
+ DECLAREContigPutFunc(putcontig8bitYCbCr22tile)
+ {
+     uint32_t *cp2;
+-    int32_t incr = 2 * toskew + w;
++    const tmsize_t incr = 2 * (tmsize_t)toskew + w;
+     (void)y;
+     fromskew = (fromskew / 2) * (2 * 2 + 2);
+     cp2 = cp + w + toskew;
+@@ -2615,7 +2615,7 @@ DECLAREContigPutFunc(putcontig8bitYCbCr12tile)
+ DECLAREContigPutFunc(putcontig8bitYCbCr12tile)
+ {
+     uint32_t *cp2;
+-    int32_t incr = 2 * toskew + w;
++    const tmsize_t incr = 2 * (tmsize_t)toskew + w;
+     (void)y;
+     fromskew = (fromskew / 1) * (1 * 2 + 2);
+     cp2 = cp + w + toskew;