diff --git a/print/latex-caption/Makefile b/print/latex-caption/Makefile
index 746d74062d5d..271b0f7dd1fa 100644
--- a/print/latex-caption/Makefile
+++ b/print/latex-caption/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	latex-caption
-PORTVERSION=	3.0.20040716
+PORTVERSION=	3.0.20050212
 PORTREVISION=	0
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
@@ -18,27 +18,28 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package that supports customization of captions
 
 BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
-		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+		${TEXMF_LSR}:${PORTSDIR}/print/tex-texmflocal
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
-		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+		${TEXMF_LSR}:${PORTSDIR}/print/tex-texmflocal
 
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+PLIST_SUB=	MKTEXLSR=${MKTEXLSR} \
 		CLASSDIR=${CLASSDIR}
 USE_GMAKE=	YES
 
-TEXMFLOCAL=	share/texmf-local
-TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
+TEXMFDIR=	share/texmf
+TEXMFLOCALDIR=	share/texmf-local
+TEXMF_LSR=	${LOCALBASE}/${TEXMFDIR}/ls-R
+TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCALDIR}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 TEX_BIN=	${LOCALBASE}/bin/etex
 YES_CMD=	/usr/bin/yes
-CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
+CLASSDIR=	${TEXMFDIR}/tex/latex/${PORTNAME:S/^latex-//}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
 
-CLASS_FILES=	caption.dtx caption.sty caption.ins caption2.dtx caption2.sty
+CLASS_FILES=	caption.dtx caption.sty caption.ins \
+		caption2.dtx caption2.sty caption3.sty
 DOC_FILES=	anleitung.pdf anleitung.tex caption.pdf caption2.pdf caption.xml
 
-IGNORE=		is already included in the teTeX distribution
-
 do-extract:
 	${MKDIR} ${WRKSRC}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${CP} ${DISTFILES} ${WRKSRC}
diff --git a/print/latex-caption/distinfo b/print/latex-caption/distinfo
index 770f2b9a6e55..5ee83f81ede9 100644
--- a/print/latex-caption/distinfo
+++ b/print/latex-caption/distinfo
@@ -1,16 +1,16 @@
-MD5 (latex-caption/caption.dtx) = 2f9aec3fc82d1477c7fc50f46b440bc0
-SIZE (latex-caption/caption.dtx) = 90299
-MD5 (latex-caption/caption2.dtx) = 4da70108386ebae8250150b8a4fd6ce8
-SIZE (latex-caption/caption2.dtx) = 44651
-MD5 (latex-caption/caption.ins) = 7abd3da7fa88050fd53f414a4603c15f
-SIZE (latex-caption/caption.ins) = 1558
-MD5 (latex-caption/anleitung.pdf) = e0b8fe9337e0da146b4183246075460e
-SIZE (latex-caption/anleitung.pdf) = 77378
-MD5 (latex-caption/anleitung.tex) = 88c9cd6beb181310bfdce87060cd8218
-SIZE (latex-caption/anleitung.tex) = 52921
-MD5 (latex-caption/caption.pdf) = fcb8c655382103a1890985f18a60aeb0
-SIZE (latex-caption/caption.pdf) = 104491
-MD5 (latex-caption/caption2.pdf) = 4e8ab4bb092a54a82d0b55fb67c85198
-SIZE (latex-caption/caption2.pdf) = 53950
-MD5 (latex-caption/caption.xml) = 6f6100b3bde49bee0ce69937a9633d48
+MD5 (latex-caption/caption.dtx) = ccce42fc1a3f8ae90c5876400e48af17
+SIZE (latex-caption/caption.dtx) = 94912
+MD5 (latex-caption/caption2.dtx) = f1dfbffe99a07f013cfe2e917a23096c
+SIZE (latex-caption/caption2.dtx) = 20614
+MD5 (latex-caption/caption.ins) = 41f6e59baa848a81250d47df5fae6f8c
+SIZE (latex-caption/caption.ins) = 1588
+MD5 (latex-caption/anleitung.pdf) = 27aba97965783dc3870e7b412e5b5516
+SIZE (latex-caption/anleitung.pdf) = 77757
+MD5 (latex-caption/anleitung.tex) = 08149bf1223eb1a77727721aca2453f1
+SIZE (latex-caption/anleitung.tex) = 53629
+MD5 (latex-caption/caption.pdf) = b0cda1562cb214f4fb4a6da50d43b0c6
+SIZE (latex-caption/caption.pdf) = 108647
+MD5 (latex-caption/caption2.pdf) = b0ce672869ef02717e6d0f1be52babf7
+SIZE (latex-caption/caption2.pdf) = 18395
+MD5 (latex-caption/caption.xml) = 73287b3fa93ece732a2ea87f640657cd
 SIZE (latex-caption/caption.xml) = 715
diff --git a/print/latex-caption/pkg-plist b/print/latex-caption/pkg-plist
index 536d64218de0..199d2ced4c08 100644
--- a/print/latex-caption/pkg-plist
+++ b/print/latex-caption/pkg-plist
@@ -10,6 +10,6 @@
 %%CLASSDIR%%/caption.ins
 %%CLASSDIR%%/caption2.dtx
 %%CLASSDIR%%/caption2.sty
-@dirrm %%CLASSDIR%%
+%%CLASSDIR%%/caption3.sty
 @exec %%MKTEXLSR%%
 @unexec %%MKTEXLSR%%