diff --git a/devel/Makefile b/devel/Makefile
index 47ab4a94dd55..618664dda583 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2049,6 +2049,7 @@
     SUBDIR += p5-Package-DeprecationManager
     SUBDIR += p5-Package-Generator
     SUBDIR += p5-Package-Stash
+    SUBDIR += p5-Package-Stash-XS
     SUBDIR += p5-PadWalker
     SUBDIR += p5-Parallel-ForkManager
     SUBDIR += p5-Parallel-Iterator
diff --git a/devel/p5-Package-Stash-XS/Makefile b/devel/p5-Package-Stash-XS/Makefile
new file mode 100644
index 000000000000..6c12cccef55d
--- /dev/null
+++ b/devel/p5-Package-Stash-XS/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	Package-Stash-XS
+# Date created:				2011-02-09
+# Whom:					milki <milki@rescomp.berkeley.edu>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	Package-Stash-XS
+PORTVERSION=	0.21
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../by-authors/id/D/DO/DOY
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	milki@rescomp.berkeley.edu
+COMMENT=	Faster and more correct implementation of the Package::Stash API
+
+TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal	\
+		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+
+PERL_CONFIGURE=	YES
+
+MAN3=		Package::Stash::XS.3
+
+.include <bsd.port.mk>
diff --git a/devel/p5-Package-Stash-XS/distinfo b/devel/p5-Package-Stash-XS/distinfo
new file mode 100644
index 000000000000..7e4787cf3778
--- /dev/null
+++ b/devel/p5-Package-Stash-XS/distinfo
@@ -0,0 +1,2 @@
+SHA256 (Package-Stash-XS-0.21.tar.gz) = 4726dc7f8f45f7c12f9ed76f60ac32a33a85a9358803aaa70c268bbfe5d38407
+SIZE (Package-Stash-XS-0.21.tar.gz) = 65550
diff --git a/devel/p5-Package-Stash-XS/pkg-descr b/devel/p5-Package-Stash-XS/pkg-descr
new file mode 100644
index 000000000000..7af513dd2cfe
--- /dev/null
+++ b/devel/p5-Package-Stash-XS/pkg-descr
@@ -0,0 +1,3 @@
+Faster and more correct implementation of the Package::Stash API.
+
+WWW: http://search.cpan.org/dist/Package-Stash-XS
diff --git a/devel/p5-Package-Stash-XS/pkg-plist b/devel/p5-Package-Stash-XS/pkg-plist
new file mode 100644
index 000000000000..4b78ce4ad058
--- /dev/null
+++ b/devel/p5-Package-Stash-XS/pkg-plist
@@ -0,0 +1,9 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/Package/Stash/XS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Stash/XS/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Stash/XS/XS.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Stash/XS/XS.so
+@dirrm    %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Stash/XS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Stash
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Package/Stash
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Package