diff --git a/deskutils/abacus/Makefile b/deskutils/abacus/Makefile
index 39152933ffa7..0002ec9a9c91 100644
--- a/deskutils/abacus/Makefile
+++ b/deskutils/abacus/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www-cad.eecs.berkeley.edu/HomePages/aml/abacus/ \
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
-PATCH_SITES=	http://people.FreeBSD.org/~steve/distfiles/
+PATCH_SITES=	${MASTER_SITE_LOCAL:S^%SUBDIR%^steve^}
 PATCHFILES=	${PKGNAME}.patch.gz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/japanese/mtools/Makefile b/japanese/mtools/Makefile
index 0c7aa7be9922..941bfdfa3204 100644
--- a/japanese/mtools/Makefile
+++ b/japanese/mtools/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	3.9.6
 CATEGORIES=	japanese emulators
 MASTER_SITES=	ftp://ftp.tux.org/pub/knaff/mtools/  \
 		http://mtools.linux.lu/  \
-		http://people.freebsd.org/~steve/distfiles/ \
+		${MASTER_SITE_LOCAL:S^%SUBDIR%^steve^} \
 		${MASTER_SITE_PORTS_JP}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME}.PC98.patch.gz
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index f9e7a949f4ff..a3028fb51746 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	buffer
 PORTVERSION=	1.17.1
 CATEGORIES=	misc
-MASTER_SITES=	http://people.FreeBSD.org/~steve/distfiles/
+MASTER_SITES=	${MASTER_SITE_LOCAL:S^%SUBDIR%^steve^}
 
 MAINTAINER=	jonny@jonny.eng.br
 
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index 373018b1c55f..2b85ee941e98 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	fd
 PORTVERSION=	1.03l
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/FDclone/ \
-		http://people.FreeBSD.org/~steve/distfiles/
+		${MASTER_SITE_LOCAL:S^%SUBDIR%^steve^}
 DISTNAME=	FD-${PORTVERSION}
 
 MAINTAINER=	nobu@psrc.isac.co.jp
diff --git a/news/unpost/Makefile b/news/unpost/Makefile
index c60c48f5f5a9..0dfd532634ad 100644
--- a/news/unpost/Makefile
+++ b/news/unpost/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	unpost
 PORTVERSION=	2.3.4
 CATEGORIES=	news
-MASTER_SITES=	http://people.FreeBSD.org/~steve/distfiles/
+MASTER_SITES=	${MASTER_SITE_LOCAL:S^%SUBDIR%^steve^}
 
 MAINTAINER=	volf@oasis.IAEhv.nl
 
diff --git a/security/vscan/Makefile b/security/vscan/Makefile
index d01367f39acc..ad54c240273f 100644
--- a/security/vscan/Makefile
+++ b/security/vscan/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	vscan
 PORTVERSION=	3.1.8
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.mcafee.com/pub/antivirus/unix/linux/ \
-		http://people.FreeBSD.org/~steve/distfiles/
+		${MASTER_SITE_LOCAL:S^%SUBDIR%^steve^}
 DISTNAME=	nlxb318e
 EXTRACT_SUFX=	.tar
 
diff --git a/shells/fd/Makefile b/shells/fd/Makefile
index 373018b1c55f..2b85ee941e98 100644
--- a/shells/fd/Makefile
+++ b/shells/fd/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	fd
 PORTVERSION=	1.03l
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/FDclone/ \
-		http://people.FreeBSD.org/~steve/distfiles/
+		${MASTER_SITE_LOCAL:S^%SUBDIR%^steve^}
 DISTNAME=	FD-${PORTVERSION}
 
 MAINTAINER=	nobu@psrc.isac.co.jp
diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile
index adfb36ad02c4..4f6bfb08178d 100644
--- a/www/webcopy/Makefile
+++ b/www/webcopy/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	webcopy
 PORTVERSION=	0.98b7
 CATEGORIES=	www
-MASTER_SITES=	http://people.freebsd.org/~steve/distfiles/
+MASTER_SITES=	${MASTER_SITE_LOCAL:S^%SUBDIR%^steve^}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index 54c366486a4a..b9cb31de5c70 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -21,7 +21,7 @@ DISTNAME=	bxform-freebsd-alpha
 .else
 DISTNAME=	bxform-freebsd-elf
 .endif
-MASTER_SITES=	http://people.FreeBSD.org/~steve/distfiles/ \
+MASTER_SITES=	${MASTER_SITE_LOCAL:S^%SUBDIR%^steve^} \
 		http://bragg.phys.uwm.edu/~zhao/ftp/
 PATCHDIR=	${.CURDIR}/patches.elf
 .else