diff --git a/astro/p5-Astro-SIMBAD/Makefile b/astro/p5-Astro-SIMBAD/Makefile
index f81540749737..6a06dedd695c 100644
--- a/astro/p5-Astro-SIMBAD/Makefile
+++ b/astro/p5-Astro-SIMBAD/Makefile
@@ -9,12 +9,11 @@
 PORTNAME=	Astro-SIMBAD
 PORTVERSION=	2.0.0
 CATEGORIES=	astro perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
-		http://www.estar.org.uk/software/
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Astro
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pgollucci@p6m7g8.com
 COMMENT=	An OO Perl interface to the SIMBAD astronomical database
 
 BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
diff --git a/astro/p5-Astro-SunTime/Makefile b/astro/p5-Astro-SunTime/Makefile
index d7ca3d9c8b23..a8c4a478339a 100644
--- a/astro/p5-Astro-SunTime/Makefile
+++ b/astro/p5-Astro-SunTime/Makefile
@@ -8,11 +8,11 @@
 PORTNAME=	Astro-SunTime
 PORTVERSION=	0.01
 CATEGORIES=	astro perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Astro
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pgollucci@p6m7g8.com
 COMMENT=	Perl interface to calculate sunrise/sunset times
 
 BUILD_DEPENDS=	${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules
diff --git a/astro/p5-Geo-METAR/Makefile b/astro/p5-Geo-METAR/Makefile
index 4d332e436bb9..50cdd282a41c 100644
--- a/astro/p5-Geo-METAR/Makefile
+++ b/astro/p5-Geo-METAR/Makefile
@@ -8,11 +8,11 @@
 PORTNAME=	Geo-METAR
 PORTVERSION=	1.15
 CATEGORIES=	astro geography
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Geo
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pgollucci@p6m7g8.com
 COMMENT=	A perl module that processes METAR information from NOAA sources
 
 PERL_CONFIGURE=	yes