diff --git a/net/p5-Amazon-SQS-Simple/Makefile b/net/p5-Amazon-SQS-Simple/Makefile
index af460572dceb..8f1170c3de02 100644
--- a/net/p5-Amazon-SQS-Simple/Makefile
+++ b/net/p5-Amazon-SQS-Simple/Makefile
@@ -6,29 +6,26 @@
 #
 
 PORTNAME=	Amazon-SQS-Simple
-PORTVERSION=	0.5
+PORTVERSION=	0.7
 CATEGORIES=	net perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/S/SW/SWHITAKER
+MASTER_SITES=	CPAN/../../authors/id/S/SW/SWHITAKER
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	glarkin@sourcehosting.net
 COMMENT=	OO API for accessing the Amazon Simple Queue Service
 
-RUN_DEPENDS=	${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-		${SITE_PERL}/Digest/HMAC_SHA1.pm:${PORTSDIR}/security/p5-Digest-HMAC \
-		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 BUILD_DEPENDS=	${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
 		${SITE_PERL}/Digest/HMAC_SHA1.pm:${PORTSDIR}/security/p5-Digest-HMAC \
 		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Amazon::SQS::Simple::Message.3 \
 		Amazon::SQS::Simple::Queue.3 \
 		Amazon::SQS::Simple::Base.3 \
+		Amazon::SQS::Simple::SendResponse.3 \
 		Amazon::SQS::Simple.3
 
 SUB_FILES=	pkg-message
diff --git a/net/p5-Amazon-SQS-Simple/distinfo b/net/p5-Amazon-SQS-Simple/distinfo
index 822b4879a024..4f517f34f6be 100644
--- a/net/p5-Amazon-SQS-Simple/distinfo
+++ b/net/p5-Amazon-SQS-Simple/distinfo
@@ -1,3 +1,3 @@
-MD5 (Amazon-SQS-Simple-0.5.tar.gz) = 213d80ce0fda88f24f7e293076b5a44b
-SHA256 (Amazon-SQS-Simple-0.5.tar.gz) = c7ff78ae5f249e1f867a8780e9c7d5270277a0306f13a3c956872bbd1aef7626
-SIZE (Amazon-SQS-Simple-0.5.tar.gz) = 7589
+MD5 (Amazon-SQS-Simple-0.7.tar.gz) = 095d48a703038e658518934a5abec076
+SHA256 (Amazon-SQS-Simple-0.7.tar.gz) = 27f2a1d9c99400dc9aa983c028db1be41c46c607d55b1189a792d7fce49f5318
+SIZE (Amazon-SQS-Simple-0.7.tar.gz) = 7759
diff --git a/net/p5-Amazon-SQS-Simple/pkg-descr b/net/p5-Amazon-SQS-Simple/pkg-descr
index e087b1559c2e..edd83fcc25be 100644
--- a/net/p5-Amazon-SQS-Simple/pkg-descr
+++ b/net/p5-Amazon-SQS-Simple/pkg-descr
@@ -1,3 +1,3 @@
 This module provides a Perlish interface to Amazon SQS.
 
-WWW:	http://search.cpan.org/~swhitaker/Amazon-SQS-Simple-0.5/
+WWW:	http://search.cpan.org/dist/Amazon-SQS-Simple/
diff --git a/net/p5-Amazon-SQS-Simple/pkg-plist b/net/p5-Amazon-SQS-Simple/pkg-plist
index 6a97b56c8cf4..bccd9813e4ce 100644
--- a/net/p5-Amazon-SQS-Simple/pkg-plist
+++ b/net/p5-Amazon-SQS-Simple/pkg-plist
@@ -1,11 +1,20 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Amazon/SQS/Simple/.packlist
+%%SITE_PERL%%/Amazon/SQS/._Simple.pm
 %%SITE_PERL%%/Amazon/SQS/Simple.pm
+%%SITE_PERL%%/Amazon/SQS/Simple/._Base.pm
+%%SITE_PERL%%/Amazon/SQS/Simple/._Message.pm
+%%SITE_PERL%%/Amazon/SQS/Simple/._Queue.pm
+%%SITE_PERL%%/Amazon/SQS/Simple/._SendResponse.pm
 %%SITE_PERL%%/Amazon/SQS/Simple/Base.pm
 %%SITE_PERL%%/Amazon/SQS/Simple/Message.pm
 %%SITE_PERL%%/Amazon/SQS/Simple/Queue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Amazon/SQS/Simple/.packlist
+%%SITE_PERL%%/Amazon/SQS/Simple/SendResponse.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amazon/SQS/Simple
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amazon/SQS
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amazon
 @dirrm %%SITE_PERL%%/Amazon/SQS/Simple
 @dirrm %%SITE_PERL%%/Amazon/SQS
 @dirrm %%SITE_PERL%%/Amazon
+@dirrmtry %%SITE_PERL%%/Amazon/SQS/Simple
+@dirrmtry %%SITE_PERL%%/Amazon/SQS
+@dirrmtry %%SITE_PERL%%/Amazon