diff --git a/devel/Makefile b/devel/Makefile
index f7a943b80022..ae9bffec4d69 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1920,6 +1920,7 @@
     SUBDIR += p5-Module-Loaded
     SUBDIR += p5-Module-Manifest
     SUBDIR += p5-Module-Math-Depends
+    SUBDIR += p5-Module-Metadata
     SUBDIR += p5-Module-Pluggable
     SUBDIR += p5-Module-Pluggable-Fast
     SUBDIR += p5-Module-Pluggable-Ordered
diff --git a/devel/p5-Module-Metadata/Makefile b/devel/p5-Module-Metadata/Makefile
new file mode 100644
index 000000000000..e1e18512e210
--- /dev/null
+++ b/devel/p5-Module-Metadata/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	Module::Metadata
+# Date created:		26 Feb 2011
+# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	Module-Metadata
+PORTVERSION=	1.000004
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../authors/id/D/DA/DAGOLDEN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	kuriyama@FreeBSD.org
+COMMENT=	Perl extension to gather package information from perl module files
+
+PERL_CONFIGURE=	yes
+
+MAN3=	Module::Metadata.3
+
+.include <bsd.port.mk>
diff --git a/devel/p5-Module-Metadata/distinfo b/devel/p5-Module-Metadata/distinfo
new file mode 100644
index 000000000000..e6cd3b12fb3d
--- /dev/null
+++ b/devel/p5-Module-Metadata/distinfo
@@ -0,0 +1,2 @@
+SHA256 (Module-Metadata-1.000004.tar.gz) = 36b41e938d31c786ac16a36dca2440ef30a5cc4c7ff2b078c701daa58a4c3b35
+SIZE (Module-Metadata-1.000004.tar.gz) = 21967
diff --git a/devel/p5-Module-Metadata/pkg-descr b/devel/p5-Module-Metadata/pkg-descr
new file mode 100644
index 000000000000..bae6eabe92c5
--- /dev/null
+++ b/devel/p5-Module-Metadata/pkg-descr
@@ -0,0 +1,4 @@
+Module::Metadata - Gather package and POD information from perl module
+files.
+
+WWW: http://search.cpan.org/dist/Module-Metadata/
diff --git a/devel/p5-Module-Metadata/pkg-plist b/devel/p5-Module-Metadata/pkg-plist
new file mode 100644
index 000000000000..214fe4b7f449
--- /dev/null
+++ b/devel/p5-Module-Metadata/pkg-plist
@@ -0,0 +1,5 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Metadata/.packlist
+%%SITE_PERL%%/Module/Metadata.pm
+@dirrmtry %%SITE_PERL%%/Module
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Metadata
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module