diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile
index a499577b9c4..dc5e19fb243 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2002/05/22 10:52:22 peter Exp $
+# $OpenBSD: Makefile,v 1.2 2002/05/22 23:33:42 naddy Exp $
 
 COMMENT=	"perl interface to tar archives"
 VERSION=	0.22
@@ -7,8 +7,7 @@ PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	archivers perl5
 NEED_VERSION=	1.502
 
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Archive
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}
 
 MAINTAINER=	Peter Galbavy <peter.galbavy@knowtion.net>
 
diff --git a/net/p5-Net-IP/Makefile b/net/p5-Net-IP/Makefile
index a8eecc4fb25..995a87ed475 100644
--- a/net/p5-Net-IP/Makefile
+++ b/net/p5-Net-IP/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2002/05/22 10:33:14 peter Exp $
+# $OpenBSD: Makefile,v 1.2 2002/05/22 23:33:42 naddy Exp $
 
 COMMENT=	"perl module for IPv4 address parsing"
 
@@ -8,8 +8,7 @@ PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	net perl5
 NEED_VERSION=	1.515
 
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 
 MAINTAINER=	Peter Galbavy <peter.galbavy@knowtion.net>