diff --git a/devel/Makefile b/devel/Makefile
index c9a9155ddfa9..69a85e2912e0 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1337,6 +1337,7 @@
     SUBDIR += p5-Test-RandomResults
     SUBDIR += p5-Test-Reporter
     SUBDIR += p5-Test-Simple
+    SUBDIR += p5-Test-Singleton
     SUBDIR += p5-Test-Strict
     SUBDIR += p5-Test-SubCalls
     SUBDIR += p5-Test-Tester
diff --git a/devel/p5-Test-Singleton/Makefile b/devel/p5-Test-Singleton/Makefile
new file mode 100644
index 000000000000..a34e35e281ff
--- /dev/null
+++ b/devel/p5-Test-Singleton/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	p5-Test-Singleton
+# Date created:		2006-07-15
+# Whom:			Gea-Suan Lin <gslin@gslin.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	Test-Singleton
+PORTVERSION=	1.03
+CATEGORIES=	devel perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	../../authors/id/T/TP/TPG
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	gslin@gslin.org
+COMMENT=	Test for Singleton classes
+
+RUN_DEPENDS=	${SITE_PERL}/Class/Singleton.pm:${PORTSDIR}/devel/p5-Class-Singleton \
+		${SITE_PERL}/Test/Builder/Tester.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	${RUN_DEPENDS}
+
+PERL_CONFIGURE=	yes
+
+MAN3=		Test::Singleton.3
+
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-Singleton/distinfo b/devel/p5-Test-Singleton/distinfo
new file mode 100644
index 000000000000..fc55b856d51c
--- /dev/null
+++ b/devel/p5-Test-Singleton/distinfo
@@ -0,0 +1,3 @@
+MD5 (Test-Singleton-1.03.tar.gz) = 3732ac90e6ceab5ab6d417077b38cc13
+SHA256 (Test-Singleton-1.03.tar.gz) = c2d8c17a065e58af93b55bdfe86dcbe418b906f182d74716ccaf89a4e4b8f69f
+SIZE (Test-Singleton-1.03.tar.gz) = 25572
diff --git a/devel/p5-Test-Singleton/pkg-descr b/devel/p5-Test-Singleton/pkg-descr
new file mode 100644
index 000000000000..b6c8ecd8bfa6
--- /dev/null
+++ b/devel/p5-Test-Singleton/pkg-descr
@@ -0,0 +1,11 @@
+** If you are unfamiliar with testing read Test::Tutorial first! **
+
+This is asimple, basic module for checking whether a class is a
+Singleton. A Singleton describes an object class that can have only
+one instance in any system. An example of a Singleton might be a print
+spooler or system registry, or any kind of central dispatcher.
+
+For a description and discussion of the Singleton class, see "Design
+Patterns", Gamma et al, Addison-Wesley, 1995, ISBN 0-201-63361-2.
+
+WWW:	http://search.cpan.org/dist/Test-Singleton/
diff --git a/devel/p5-Test-Singleton/pkg-plist b/devel/p5-Test-Singleton/pkg-plist
new file mode 100644
index 000000000000..3699269d3b81
--- /dev/null
+++ b/devel/p5-Test-Singleton/pkg-plist
@@ -0,0 +1,6 @@
+@comment $FreeBSD$
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Singleton/.packlist
+%%SITE_PERL%%/Test/Singleton.pm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Singleton
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test