diff --git a/devel/Makefile b/devel/Makefile
index 7a6483a4bf23..745b3fc88f4a 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -926,6 +926,7 @@
     SUBDIR += p5-File-Temp
     SUBDIR += p5-File-Type
     SUBDIR += p5-File-chdir
+    SUBDIR += p5-File-pushd
     SUBDIR += p5-FileHandle-Unget
     SUBDIR += p5-Filesys-Statvfs_Df
     SUBDIR += p5-Filesys-Virtual
diff --git a/devel/p5-File-pushd/Makefile b/devel/p5-File-pushd/Makefile
new file mode 100644
index 000000000000..8f9348937bf7
--- /dev/null
+++ b/devel/p5-File-pushd/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:	devel/p5-File-pushd
+# Date created:				04 November 2005
+# Whom:					Anton Berezin <tobez@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	File-pushd
+PORTVERSION=	0.20
+CATEGORIES=	devel perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	File
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	tobez@FreeBSD.org
+COMMENT=	File::pushd - temporary chdir for a limited scope
+
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+PERL_CONFIGURE=	yes
+
+MAN3=	File::pushd.3
+
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+IGNORE=		requires perl 5.6.0 or later. Install lang/perl5.8 and try again
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-File-pushd/distinfo b/devel/p5-File-pushd/distinfo
new file mode 100644
index 000000000000..d4310669893a
--- /dev/null
+++ b/devel/p5-File-pushd/distinfo
@@ -0,0 +1,2 @@
+MD5 (File-pushd-0.20.tar.gz) = a87e109ce8657bc360799f557d0ecd65
+SIZE (File-pushd-0.20.tar.gz) = 12135
diff --git a/devel/p5-File-pushd/pkg-descr b/devel/p5-File-pushd/pkg-descr
new file mode 100644
index 000000000000..d52718886fcd
--- /dev/null
+++ b/devel/p5-File-pushd/pkg-descr
@@ -0,0 +1,8 @@
+File::pushd does a temporary chdir that is easily and automatically
+reverted.  It works by creating a simple object that caches the original
+working directory.  When the object is destroyed, the destructor calls
+chdir to revert to the original working directory.  By storing the
+object in a lexical variable with a limited scope, this happens
+automatically at the end of the scope.
+
+WWW: http://search.cpan.org/dist/File-pushd/
diff --git a/devel/p5-File-pushd/pkg-plist b/devel/p5-File-pushd/pkg-plist
new file mode 100644
index 000000000000..740425c86951
--- /dev/null
+++ b/devel/p5-File-pushd/pkg-plist
@@ -0,0 +1,5 @@
+%%SITE_PERL%%/File/pushd.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/pushd/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/pushd 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true