diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index 939e9efe3548..c9bda2d758ea 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	bcc
 PORTVERSION=	1995.03.12
 PORTREVISION=	2
 CATEGORIES=	devel lang
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	joerg
+MASTER_SITES=	LOCAL/joerg
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	joerg@FreeBSD.org
diff --git a/editors/bpatch/Makefile b/editors/bpatch/Makefile
index da4fe8c268a4..c575738ea033 100644
--- a/editors/bpatch/Makefile
+++ b/editors/bpatch/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	bpatch
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	joerg
+MASTER_SITES=	LOCAL/joerg
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	joerg@FreeBSD.org