Index: Mk/Uses/linux.mk
===================================================================
--- Mk/Uses/linux.mk	(revision 456297)
+++ Mk/Uses/linux.mk	(working copy)
@@ -175,8 +175,8 @@
 
 DISTVERSIONSUFFIX?=	-${RPMVERSION}
 
+.ifndef MASTER_SITES
 .if ${linux_ARGS} == c6
-.ifndef MASTER_SITES
 MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}
 MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \
 			centos/${LINUX_DIST_VER}/updates/x86_64/Packages/:DEFAULT,amd64 \
@@ -184,10 +184,8 @@
 			centos/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \
 			centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
 			centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
-.endif
 DIST_SUBDIR?=		centos
 .elif ${linux_ARGS} == c7
-.ifndef MASTER_SITES
 MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}
 MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \
 			centos/${LINUX_DIST_VER}/updates/x86_64/Packages/:DEFAULT,amd64 \
@@ -195,9 +193,9 @@
 			altarch/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \
 			centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
 			centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
-.endif
 DIST_SUBDIR?=		centos
 .endif # ${linux_ARGS} == *
+.endif	# !MASTER_SITES
 
 PKGNAMEPREFIX?=		linux-${linux_ARGS}-
 EXTRACT_SUFX?=		.rpm