diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index 85112726680d..06a94b4e56ec 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	Mail-Spool
 PORTVERSION=	0.50
 CATEGORIES=	mail perl5
-MASTER_SITES=	https://demo.portaone.com/~andrew/
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-fixed
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -19,8 +19,6 @@ BUILD_DEPENDS=	${SITE_PERL}/File/NFSLock.pm:${PORTSDIR}/devel/p5-File-NFSLock \
 		${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 PERL_CONFIGURE=	yes
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/mail/p5-Mail-Spool/distinfo b/mail/p5-Mail-Spool/distinfo
index be248a664885..63c18766f9a4 100644
--- a/mail/p5-Mail-Spool/distinfo
+++ b/mail/p5-Mail-Spool/distinfo
@@ -1 +1 @@
-MD5 (Mail-Spool-0.50-fixed.tar.gz) = 20f6db5750426a7dd6ce4e0461dbe2f3
+MD5 (Mail-Spool-0.50.tar.gz) = a06bc2a6977815b55ba1ed3c82919ce6