diff --git a/devel/p5-Config-Setting/Makefile b/devel/p5-Config-Setting/Makefile
index 1a6205740cf1..d80e6c93fb15 100644
--- a/devel/p5-Config-Setting/Makefile
+++ b/devel/p5-Config-Setting/Makefile
@@ -6,20 +6,24 @@
 #
 
 PORTNAME=	Config-Setting
-PORTVERSION=	0.01
+PORTVERSION=	0.04
 CATEGORIES=	devel perl5
-MASTER_SITES=	http://www.happygiraffe.net/dist/
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Config
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A class that provides an easy interface to use config files
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	${RUN_DEPENDS}
+BUILD_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 
-PERL_CONFIGURE=	yes
+PERL_MODBUILD=	yes
 
 MAN3=	Config::Setting.3 \
-	Config::Setting::Fileprovider.3 \
+	Config::Setting::Chunk.3 \
+	Config::Setting::FileProvider.3 \
 	Config::Setting::IniParser.3 \
 	Config::Setting::XMLParser.3
 
diff --git a/devel/p5-Config-Setting/distinfo b/devel/p5-Config-Setting/distinfo
index 6a355be54b1f..2dc48e7606c0 100644
--- a/devel/p5-Config-Setting/distinfo
+++ b/devel/p5-Config-Setting/distinfo
@@ -1,3 +1,3 @@
-MD5 (Config-Setting-0.01.tar.gz) = 99296fec870ad23e05f30a3c9751e935
-SHA256 (Config-Setting-0.01.tar.gz) = b41f45cce43bd5a009ac651df3a509e4fb2bad630093391d58c78e619a25864e
-SIZE (Config-Setting-0.01.tar.gz) = 7121
+MD5 (Config-Setting-0.04.tar.gz) = ea11786272b95e39ea2bdb68b10674df
+SHA256 (Config-Setting-0.04.tar.gz) = 567e29ecae45c7e5a59d767e56258ee592357018235bc33539f15776eb392609
+SIZE (Config-Setting-0.04.tar.gz) = 10063
diff --git a/devel/p5-Config-Setting/pkg-descr b/devel/p5-Config-Setting/pkg-descr
index e7590a5426d0..6eec594f5b15 100644
--- a/devel/p5-Config-Setting/pkg-descr
+++ b/devel/p5-Config-Setting/pkg-descr
@@ -10,7 +10,7 @@ access mechanism can also be overridden, the setting don't have to
 come from a file, but (maybe) from a website. You'll have to write
 your own there, though.
 
-WWW: http://www.happygiraffe.net/Config-Setting
+WWW: http://search.cpan.org/dist/Config-Setting/
 
 - Pete
 petef@databits.net
diff --git a/devel/p5-Config-Setting/pkg-plist b/devel/p5-Config-Setting/pkg-plist
index 7719ca909bf3..f4d300e6714f 100644
--- a/devel/p5-Config-Setting/pkg-plist
+++ b/devel/p5-Config-Setting/pkg-plist
@@ -1,9 +1,7 @@
 %%SITE_PERL%%/Config/Setting.pm
+%%SITE_PERL%%/Config/Setting/Chunk.pm
 %%SITE_PERL%%/Config/Setting/FileProvider.pm
 %%SITE_PERL%%/Config/Setting/IniParser.pm
 %%SITE_PERL%%/Config/Setting/XMLParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Setting/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Setting
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
 @dirrm %%SITE_PERL%%/Config/Setting
 @dirrmtry %%SITE_PERL%%/Config