diff --git a/devel/p5-Data-TemporaryBag/Makefile b/devel/p5-Data-TemporaryBag/Makefile
index 71d3214ed0bb..220864b57472 100644
--- a/devel/p5-Data-TemporaryBag/Makefile
+++ b/devel/p5-Data-TemporaryBag/Makefile
@@ -6,18 +6,28 @@
 #
 
 PORTNAME=	Data-TemporaryBag
-PORTVERSION=	0.04
+PORTVERSION=	0.06
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Data
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	skv@protey.ru
+MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Handle long size data using temporary file
 
+BUILD_DEPENDS=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Data::TemporaryBag.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+post-patch:
+	@${PERL} -pi.orig -e 'if($$.==17){s/^our \(/use vars qw(/;s/,//g}' \
+		${WRKSRC}/TemporaryBag.pm
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Data-TemporaryBag/distinfo b/devel/p5-Data-TemporaryBag/distinfo
index 38bae764374c..41645be88d44 100644
--- a/devel/p5-Data-TemporaryBag/distinfo
+++ b/devel/p5-Data-TemporaryBag/distinfo
@@ -1 +1 @@
-MD5 (Data-TemporaryBag-0.04.tar.gz) = f0b6fee3c0e1b1dcf3b9bf73a2ddaa79
+MD5 (Data-TemporaryBag-0.06.tar.gz) = d9b603286020456ca24a297f0b8fb20d
diff --git a/devel/p5-Data-TemporaryBag/pkg-descr b/devel/p5-Data-TemporaryBag/pkg-descr
index 19c9074cd191..61d43185cf0b 100644
--- a/devel/p5-Data-TemporaryBag/pkg-descr
+++ b/devel/p5-Data-TemporaryBag/pkg-descr
@@ -3,7 +3,7 @@ handling long size data.  The short size data are kept on
 memory.  When the data size becomes over $Threshold size,
 they are saved into a temporary file internally.
 
-WWW: http://search.cpan.org/search?dist=Data-TemporaryBag
+WWW: http://search.cpan.org/dist/Data-TemporaryBag/
 
 -- Sergey Skvortsov
-skv@protey.ru
+skv@FreeBSD.org
diff --git a/devel/p5-Data-TemporaryBag/pkg-plist b/devel/p5-Data-TemporaryBag/pkg-plist
index 55601e9712dc..5aacae6c7115 100644
--- a/devel/p5-Data-TemporaryBag/pkg-plist
+++ b/devel/p5-Data-TemporaryBag/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/TemporaryBag/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Data/TemporaryBag.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/TemporaryBag
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+%%SITE_PERL%%/Data/TemporaryBag.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TemporaryBag/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TemporaryBag
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true