diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 722974191964..e4a774287987 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	tiff
 PORTVERSION=	3.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://dl1.maptools.org/dl/libtiff/
diff --git a/graphics/tiff/files/patch-tiffdump.c b/graphics/tiff/files/patch-tiffdump.c
new file mode 100644
index 000000000000..5928954ce8d5
--- /dev/null
+++ b/graphics/tiff/files/patch-tiffdump.c
@@ -0,0 +1,14 @@
+--- tools/tiffdump.c.orig	2004-09-03 12:16:01 +0400
++++ tools/tiffdump.c	2004-12-22 01:57:51 +0300
+@@ -307,6 +307,11 @@ ReadDirectory(int fd, unsigned ix, off_t
+ 			continue;
+ 		}
+ 		space = dp->tdir_count * datawidth[dp->tdir_type];
++		if (space <= 0) {
++			printf(">\n");
++			Error("Invalid count for tag %u", dp->tdir_tag);
++			continue;
++		}
+ 		if (space <= 4) {
+ 			switch (dp->tdir_type) {
+ 			case TIFF_FLOAT: