diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index c7807bdf3ea..6d18de5656d 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -1,18 +1,19 @@
-# $OpenBSD: Makefile,v 1.15 2001/04/13 03:24:23 obecian Exp $
+# $OpenBSD: Makefile,v 1.16 2001/10/24 12:41:38 naddy Exp $
 
 COMMENT=	"read CD digital audio data through the SCSI bus"
 DISTNAME=	tosha-0.6
 CATEGORIES=	audio
 NEED_VERSION=	1.364
-MASTER_SITES=	ftp://ftp.tu-clausthal.de/pub/unix/audio/
-
-MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>
 
+# BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=		${MASTER_SITE_FREEBSD_LOCAL}
+MASTER_SITE_SUBDIR=	markp
+
 MAKE_ENV=	SYSCONFDIR='${SYSCONFDIR}'
 
 .include <bsd.port.mk>
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index 27ce612c2f7..a24f162cc76 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2001/04/14 11:36:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.15 2001/10/24 12:43:36 naddy Exp $
 
 COMMENT=	"buffer sporadic I/O for faster tape and pipe throughput"
 
@@ -14,7 +14,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://people.freebsd.org/~steve/distfiles/
+MASTER_SITES=		${MASTER_SITE_FREEBSD_LOCAL}
+MASTER_SITE_SUBDIR=	steve
+
 EXTRACT_SUFX=	.tar.bz2
 
 WRKDIST=	${WRKDIR}