diff --git a/devel/Makefile b/devel/Makefile
index 617a490e5cbe..aed3af43d060 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2447,6 +2447,7 @@
     SUBDIR += p5-Test-Strict
     SUBDIR += p5-Test-SubCalls
     SUBDIR += p5-Test-Synopsis
+    SUBDIR += p5-Test-Sys-Info
     SUBDIR += p5-Test-TAP-HTMLMatrix
     SUBDIR += p5-Test-TAP-Model
     SUBDIR += p5-Test-TCP
diff --git a/devel/p5-Test-Sys-Info/Makefile b/devel/p5-Test-Sys-Info/Makefile
new file mode 100644
index 000000000000..098cbc907b94
--- /dev/null
+++ b/devel/p5-Test-Sys-Info/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	p5-Test-Sys-Info
+# Date created:		2011-10-09
+# Whom:			Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	Test-Sys-Info
+PORTVERSION=	0.20
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Centralized test suite for Sys::Info
+
+TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+
+PERL_CONFIGURE=	yes
+
+MAN3=		Test::Sys::Info.3 \
+		Test::Sys::Info::Driver.3
+
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-Sys-Info/distinfo b/devel/p5-Test-Sys-Info/distinfo
new file mode 100644
index 000000000000..ea5e7c79987f
--- /dev/null
+++ b/devel/p5-Test-Sys-Info/distinfo
@@ -0,0 +1,2 @@
+SHA256 (Test-Sys-Info-0.20.tar.gz) = 7b81248196f9a90e7e8abda0041baba052209553918ce55eb99e8a80fe158549
+SIZE (Test-Sys-Info-0.20.tar.gz) = 19218
diff --git a/devel/p5-Test-Sys-Info/pkg-descr b/devel/p5-Test-Sys-Info/pkg-descr
new file mode 100644
index 000000000000..162309346df7
--- /dev/null
+++ b/devel/p5-Test-Sys-Info/pkg-descr
@@ -0,0 +1,3 @@
+Test::Sys::Info is a centralized test suite for Sys::Info Drivers.
+
+WWW: http://search.cpan.org/dist/Test-Sys-Info/
diff --git a/devel/p5-Test-Sys-Info/pkg-plist b/devel/p5-Test-Sys-Info/pkg-plist
new file mode 100644
index 000000000000..ea50fbf32d8a
--- /dev/null
+++ b/devel/p5-Test-Sys-Info/pkg-plist
@@ -0,0 +1,9 @@
+%%SITE_PERL%%/Test/Sys/Info.pm
+%%SITE_PERL%%/Test/Sys/Info/Driver.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Sys/Info/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Sys/Info
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrm %%SITE_PERL%%/Test/Sys/Info
+@dirrmtry %%SITE_PERL%%/Test/Sys
+@dirrmtry %%SITE_PERL%%/Test