diff --git a/devel/Makefile b/devel/Makefile
index 7641923dd946..7395987cde9e 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2800,6 +2800,7 @@
     SUBDIR += p5-Test-BinaryData
     SUBDIR += p5-Test-Bits
     SUBDIR += p5-Test-Block
+    SUBDIR += p5-Test-CPAN-Meta
     SUBDIR += p5-Test-CPAN-Meta-YAML
     SUBDIR += p5-Test-CheckDeps
     SUBDIR += p5-Test-CheckManifest
diff --git a/devel/p5-Test-CPAN-Meta/Makefile b/devel/p5-Test-CPAN-Meta/Makefile
new file mode 100644
index 000000000000..e4d965281c37
--- /dev/null
+++ b/devel/p5-Test-CPAN-Meta/Makefile
@@ -0,0 +1,21 @@
+# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	Test-CPAN-Meta
+PORTVERSION=	0.23
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Validate your CPAN META.yml files
+
+LICENSE=	ART20
+
+TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+
+USE_PERL5=	configure
+USES=		perl5
+
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-CPAN-Meta/distinfo b/devel/p5-Test-CPAN-Meta/distinfo
new file mode 100644
index 000000000000..07fe98ee7461
--- /dev/null
+++ b/devel/p5-Test-CPAN-Meta/distinfo
@@ -0,0 +1,2 @@
+SHA256 (Test-CPAN-Meta-0.23.tar.gz) = dda70c5cb61eddc6d3148cb66b6ff5eb4546a065257f4c104112a8a8a3575116
+SIZE (Test-CPAN-Meta-0.23.tar.gz) = 15855
diff --git a/devel/p5-Test-CPAN-Meta/pkg-descr b/devel/p5-Test-CPAN-Meta/pkg-descr
new file mode 100644
index 000000000000..0f39193f200d
--- /dev/null
+++ b/devel/p5-Test-CPAN-Meta/pkg-descr
@@ -0,0 +1,6 @@
+Test::CPAN::Meta was written to ensure that a META.yml file, provided with a
+standard distribution uploaded to CPAN, meets the specifications that are slowly
+being introduced to module uploads, via the use of package makers and installers
+such as ExtUtils::MakeMaker, Module::Build and Module::Install.
+
+WWW: http://search.cpan.org/dist/Test-CPAN-Meta/
diff --git a/devel/p5-Test-CPAN-Meta/pkg-plist b/devel/p5-Test-CPAN-Meta/pkg-plist
new file mode 100644
index 000000000000..2ec54c21963b
--- /dev/null
+++ b/devel/p5-Test-CPAN-Meta/pkg-plist
@@ -0,0 +1,11 @@
+%%SITE_PERL%%/Test/CPAN/Meta.pm
+%%SITE_PERL%%/Test/CPAN/Meta/Version.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/CPAN/Meta/.packlist
+%%PERL5_MAN3%%/Test::CPAN::Meta.3.gz
+%%PERL5_MAN3%%/Test::CPAN::Meta::Version.3.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/CPAN/Meta
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/CPAN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test/CPAN/Meta
+@dirrmtry %%SITE_PERL%%/Test/CPAN
+@dirrmtry %%SITE_PERL%%/Test