diff --git a/devel/Makefile b/devel/Makefile
index dcaa66cdf3ef..10288853f288 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2857,6 +2857,7 @@
     SUBDIR += p5-Test-Class-Most
     SUBDIR += p5-Test-ClassAPI
     SUBDIR += p5-Test-Classy
+    SUBDIR += p5-Test-CleanNamespaces
     SUBDIR += p5-Test-Cmd
     SUBDIR += p5-Test-Command
     SUBDIR += p5-Test-Command-Simple
diff --git a/devel/p5-Test-CleanNamespaces/Makefile b/devel/p5-Test-CleanNamespaces/Makefile
new file mode 100644
index 000000000000..86d5965560e5
--- /dev/null
+++ b/devel/p5-Test-CleanNamespaces/Makefile
@@ -0,0 +1,40 @@
+# Created by: Frederic Culot <culot@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	Test-CleanNamespaces
+PORTVERSION=	0.16
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	culot@FreeBSD.org
+COMMENT=	Check for uncleaned imports
+
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
+		p5-File-Find-Rule-Perl>0:${PORTSDIR}/devel/p5-File-Find-Rule-Perl \
+		p5-Module-Runtime>0:${PORTSDIR}/devel/p5-Module-Runtime \
+		p5-Package-Stash>=0.14:${PORTSDIR}/devel/p5-Package-Stash \
+		p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
+		p5-Sub-Identify>0:${PORTSDIR}/devel/p5-Sub-Identify \
+		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
+		p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
+		p5-Test-Tester>0:${PORTSDIR}/devel/p5-Test-Tester \
+		p5-Test-Warnings>=0.009:${PORTSDIR}/devel/p5-Test-Warnings
+
+USES=		perl5
+USE_PERL5=	configure
+
+PLIST_FILES=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/CleanNamespaces/.packlist \
+		%%SITE_PERL%%/Test/CleanNamespaces.pm \
+		%%PERL5_MAN3%%/Test::CleanNamespaces.3.gz
+
+PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/CleanNamespaces
+PLIST_DIRSTRY=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test \
+		%%SITE_PERL%%/Test
+
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-CleanNamespaces/distinfo b/devel/p5-Test-CleanNamespaces/distinfo
new file mode 100644
index 000000000000..4faf6b66b27d
--- /dev/null
+++ b/devel/p5-Test-CleanNamespaces/distinfo
@@ -0,0 +1,2 @@
+SHA256 (Test-CleanNamespaces-0.16.tar.gz) = 9779378394b9be32cf04129fafe2d40d74f6f200f593f1494998bd128a6ed9fa
+SIZE (Test-CleanNamespaces-0.16.tar.gz) = 30598
diff --git a/devel/p5-Test-CleanNamespaces/pkg-descr b/devel/p5-Test-CleanNamespaces/pkg-descr
new file mode 100644
index 000000000000..2fbc9b1bc0dd
--- /dev/null
+++ b/devel/p5-Test-CleanNamespaces/pkg-descr
@@ -0,0 +1,6 @@
+Test::CleanNamespaces lets you check your module's namespaces for imported
+functions you might have forgotten to remove with namespace::autoclean or
+namespace::clean and are therefore available to be called as methods, which
+usually isn't want you want.
+
+WWW: http://search.cpan.org/dist/Test-CleanNamespaces/