diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 29ef8b9dc525..e9a7b145998d 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tiff
-PORTVERSION=	4.0.3
-PORTREVISION=	5
+DISTVERSION=	4.0.4beta
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://download.osgeo.org/libtiff/
@@ -17,7 +16,10 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libjbig.so:${PORTSDIR}/graphics/jbigkit
 
-USES=		libtool
+USES=		cpe libtool
+CPE_PRODUCT=	libtiff
+CPE_VERSION=	${DISTVERSION:C/[a-z]+//}
+CPE_UPDATE=	${DISTVERSION:C/[0-9.]+//}
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-jpeg-include-dir=${LOCALBASE}/include \
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 983494f5b66e..cc4f307cad91 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tiff-4.0.3.tar.gz) = ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872
-SIZE (tiff-4.0.3.tar.gz) = 2051630
+SHA256 (tiff-4.0.4beta.tar.gz) = 5bd6c8e9be4ec318f6beb0c3f28b9ee31bd8b615195a00e0acc3eb5d08b26c1b
+SIZE (tiff-4.0.4beta.tar.gz) = 2098962
diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist
index 28af9c1cd724..34d7d5f216d7 100644
--- a/graphics/tiff/pkg-plist
+++ b/graphics/tiff/pkg-plist
@@ -30,11 +30,11 @@ lib/libtiff.a
 lib/libtiff.so
 lib/libtiff.so.4
 lib/libtiff.so.5
-lib/libtiff.so.5.2.0
+lib/libtiff.so.5.2.1
 lib/libtiffxx.a
 lib/libtiffxx.so
 lib/libtiffxx.so.5
-lib/libtiffxx.so.5.2.0
+lib/libtiffxx.so.5.2.1
 libdata/pkgconfig/libtiff-4.pc
 man/man1/bmp2tiff.1.gz
 man/man1/fax2ps.1.gz
@@ -301,3 +301,5 @@ man/man3/libtiff.3tiff.gz
 %%PORTDOCS%%%%DOCSDIR%%/v4.0.0.html
 %%PORTDOCS%%%%DOCSDIR%%/v4.0.1.html
 %%PORTDOCS%%%%DOCSDIR%%/v4.0.2.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0.3.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0.4beta.html
diff --git a/graphics/tiffgt/Makefile b/graphics/tiffgt/Makefile
index 3f39d505b3da..7df22a84a8d1 100644
--- a/graphics/tiffgt/Makefile
+++ b/graphics/tiffgt/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	tiffgt
-PORTVERSION=	4.0.3
-PORTREVISION=	3
+DISTVERSION=	4.0.4beta
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://download.osgeo.org/libtiff/
-DISTNAME=	tiff-${PORTVERSION}
+DISTNAME=	tiff-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 Tools for working with TIFF images
@@ -18,7 +17,10 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libjbig.so:${PORTSDIR}/graphics/jbigkit \
 		libtiff.so:${PORTSDIR}/${PKGCATEGORY}/tiff
 
-USES=		libtool
+USES=		cpe libtool
+CPE_PRODUCT=	libtiff
+CPE_VERSION=	${DISTVERSION:C/[a-z]+//}
+CPE_UPDATE=	${DISTVERSION:C/[0-9.]+//}
 USE_XORG=	sm ice xmu xi x11
 USE_GL=		glut glu gl
 USE_LDCONFIG=	yes
diff --git a/graphics/tiffgt/distinfo b/graphics/tiffgt/distinfo
index 983494f5b66e..cc4f307cad91 100644
--- a/graphics/tiffgt/distinfo
+++ b/graphics/tiffgt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tiff-4.0.3.tar.gz) = ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872
-SIZE (tiff-4.0.3.tar.gz) = 2051630
+SHA256 (tiff-4.0.4beta.tar.gz) = 5bd6c8e9be4ec318f6beb0c3f28b9ee31bd8b615195a00e0acc3eb5d08b26c1b
+SIZE (tiff-4.0.4beta.tar.gz) = 2098962