diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 9a21edda1a55..5bba8b7ee064 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	autoconf
 PORTVERSION=	2.53
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	autoconf
+MASTER_SITES	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	ade/gnu
 
 MAINTAINER=	ade@FreeBSD.org
 COMMENT=	Automatically configure source code on many Un*x platforms
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index e535c649df09..7ededefb9aa4 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	autoconf
 PORTVERSION=	2.13.000227
 PORTREVISION=	5
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE} ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	binutils autoconf
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	ade/gnu
 DISTNAME=	autoconf-000227
 
 MAINTAINER=	ade@FreeBSD.org