Index: Mk/bsd.sites.mk
===================================================================
--- Mk/bsd.sites.mk
+++ Mk/bsd.sites.mk
@@ -775,43 +775,18 @@
 	http://ftp.osuosl.org/pub/mozdev/%SUBDIR%/
 .endif
 
-# releases.mozilla.org mirror sites
-#
-# For the full list, see the following:
-#
-#	http://www.mozilla.org/mirrors.html
-#
 .if !defined(IGNORE_MASTER_SITE_MOZILLA)
 MASTER_SITE_MOZILLA+= \
-	https://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
-	http://mirror3.mirrors.tds.net/pub/mozilla.org/%SUBDIR%/ \
-	http://mozilla.isc.org/pub/mozilla.org/%SUBDIR%/ \
 	http://releases.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
-	http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/%SUBDIR%/ \
-	http://jp-nii01.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
-	http://jp-nii02.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
-	http://mirror.internode.on.net/pub/mozilla/%SUBDIR%/ \
-	http://ftp.acc.umu.se/pub/mozilla.org/%SUBDIR%/ \
-	http://mozilla.c3sl.ufpr.br/releases/%SUBDIR%/ \
-	http://www.gtlib.gatech.edu/pub/mozilla.org/%SUBDIR%/ \
-	ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
-	ftp://ftp.fh-wolfenbuettel.de/pub/www/mozilla/%SUBDIR%/ \
-	ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.mozilla.org/pub/%SUBDIR%/ \
-	http://ftp.twaren.net/Unix/Mozilla/%SUBDIR%/
-.endif
-
-.if !defined(IGNORE_MASTER_SITE_BUGZILLA)
-MASTER_SITE_BUGZILLA+= \
 	https://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
 	http://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
-	ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
-	http://mirror.internode.on.net/pub/mozilla/%SUBDIR%/
+	ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/
 .endif
 
-.if !defined(IGNORE_MASTER_SITE_MOZILLA_EXTENDED)
-MASTER_SITE_MOZILLA_EXTENDED+= \
-	http://releases.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
-	${MASTER_SITE_MOZILLA}
+.if !defined(IGNORE_MASTER_SITE_MOZILLA_ADDONS)
+MASTER_SITE_MOZILLA_ADDONS+= \
+	https://addons.cdn.mozilla.net/user-media/%SUBDIR%/ \
+	http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_MPLAYERHQ)
Index: audio/opus-tools/Makefile
===================================================================
--- audio/opus-tools/Makefile
+++ audio/opus-tools/Makefile
@@ -5,7 +5,7 @@
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/opus/ \
-		MOZILLA_EXTENDED/opus
+		MOZILLA/opus
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Encode, inspect, and decode Opus files
Index: audio/opus/Makefile
===================================================================
--- audio/opus/Makefile
+++ audio/opus/Makefile
@@ -5,7 +5,7 @@
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/opus/ \
-		MOZILLA_EXTENDED/opus
+		MOZILLA/opus
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	IETF audio codec
Index: audio/opusfile/Makefile
===================================================================
--- audio/opusfile/Makefile
+++ audio/opusfile/Makefile
@@ -5,7 +5,7 @@
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/opus/ \
-		MOZILLA_EXTENDED/opus
+		MOZILLA/opus
 
 MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Opus playback library
Index: devel/bugzilla44/Makefile
===================================================================
--- devel/bugzilla44/Makefile
+++ devel/bugzilla44/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	4.4.8
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	BUGZILLA/webtools BUGZILLA/webtools/archived
+MASTER_SITES=	MOZILLA/webtools MOZILLA/webtools/archived
 
 MAINTAINER=	bz-ports@FreeBSD.org
 COMMENT=	Bug-tracking system developed by Mozilla Project
Index: lang/spidermonkey17/Makefile
===================================================================
--- lang/spidermonkey17/Makefile
+++ lang/spidermonkey17/Makefile
@@ -5,7 +5,7 @@
 DISTVERSION=	1.7.0
 PORTREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	MOZILLA_EXTENDED/js
+MASTER_SITES=	MOZILLA/js
 DISTNAME=	js-${DISTVERSION}
 
 MAINTAINER=	citric@cubicone.tmetic.com
Index: mail/linux-thunderbird/Makefile
===================================================================
--- mail/linux-thunderbird/Makefile
+++ mail/linux-thunderbird/Makefile
@@ -5,7 +5,7 @@
 DISTVERSION=	31.7.0
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US/
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
Index: mail/thunderbird-i18n/Makefile
===================================================================
--- mail/thunderbird-i18n/Makefile
+++ mail/thunderbird-i18n/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	31.7.0
 CATEGORIES=	mail news net-im
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi/
+		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
 PKGNAMEPREFIX=
 DISTFILES=	${THUNDERBIRD_I18N_:S/$/.xpi/}
 DIST_SUBDIR=	xpi/${DISTNAME}
Index: mail/thunderbird/Makefile
===================================================================
--- mail/thunderbird/Makefile
+++ mail/thunderbird/Makefile
@@ -5,7 +5,7 @@
 DISTVERSION=	31.7.0
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
 DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 
Index: textproc/so-hunspell/Makefile
===================================================================
--- textproc/so-hunspell/Makefile
+++ textproc/so-hunspell/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	1.0.2
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	MOZILLA_EXTENDED/addons/13375
+MASTER_SITES=	MOZILLA_ADDONS/addons/13375
 PKGNAMEPREFIX=	so-
 DISTNAME=	qaamuuska_af_soomaaliga-${PORTVERSION}-tb+fx
 EXTRACT_SUFX=	.xpi
Index: textproc/sr-hunspell/Makefile
===================================================================
--- textproc/sr-hunspell/Makefile
+++ textproc/sr-hunspell/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	0.18
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	MOZILLA_EXTENDED/addons/10894
+MASTER_SITES=	MOZILLA_ADDONS/addons/10894
 PKGNAMEPREFIX=	sr-
 DISTNAME=	serbian_dictionary-${PORTVERSION}-fx+tb+sm
 EXTRACT_SUFX=	.xpi
Index: textproc/ss-hunspell/Makefile
===================================================================
--- textproc/ss-hunspell/Makefile
+++ textproc/ss-hunspell/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	20110323
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	MOZILLA_EXTENDED/addons/46614
+MASTER_SITES=	MOZILLA_ADDONS/addons/46614
 PKGNAMEPREFIX=	ss-
 DISTNAME=	swati_spell_checker-${PORTVERSION}-tb+sm+fx+fn
 EXTRACT_SUFX=	.xpi
Index: textproc/tk-hunspell/Makefile
===================================================================
--- textproc/tk-hunspell/Makefile
+++ textproc/tk-hunspell/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	hunspell
 PORTVERSION=	0.1.6
 CATEGORIES=	textproc
-MASTER_SITES=	MOZILLA_EXTENDED/addons/204314
+MASTER_SITES=	MOZILLA_ADDONS/addons/204314
 PKGNAMEPREFIX=	tk-
 DISTNAME=	turkmen_spell_checker_dictionary-${PORTVERSION}-tb+fx+sm
 EXTRACT_SUFX=	.xpi
Index: textproc/tn-hunspell/Makefile
===================================================================
--- textproc/tn-hunspell/Makefile
+++ textproc/tn-hunspell/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	20110323
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	MOZILLA_EXTENDED/addons/46617
+MASTER_SITES=	MOZILLA_ADDONS/addons/46617
 PKGNAMEPREFIX=	tn-
 DISTNAME=	tswana_spell_checker-${PORTVERSION}-tb+sm+fx+fn
 EXTRACT_SUFX=	.xpi
Index: textproc/ts-hunspell/Makefile
===================================================================
--- textproc/ts-hunspell/Makefile
+++ textproc/ts-hunspell/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	20110323
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	MOZILLA_EXTENDED/addons/46611
+MASTER_SITES=	MOZILLA_ADDONS/addons/46611
 PKGNAMEPREFIX=	ts-
 DISTNAME=	tsonga_spell_checker-${PORTVERSION}-tb+sm+fx+fn
 EXTRACT_SUFX=	.xpi
Index: textproc/ve-hunspell/Makefile
===================================================================
--- textproc/ve-hunspell/Makefile
+++ textproc/ve-hunspell/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	20110323
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	MOZILLA_EXTENDED/addons/46601
+MASTER_SITES=	MOZILLA_ADDONS/addons/46601
 PKGNAMEPREFIX=	ve-
 DISTNAME=	venda_spell_checker-${PORTVERSION}-tb+fn+fx+sm
 EXTRACT_SUFX=	.xpi
Index: textproc/xh-hunspell/Makefile
===================================================================
--- textproc/xh-hunspell/Makefile
+++ textproc/xh-hunspell/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	20110323
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	MOZILLA_EXTENDED/addons/46599
+MASTER_SITES=	MOZILLA_ADDONS/addons/46599
 PKGNAMEPREFIX=	xh-
 DISTNAME=	xhosa_spell_checker-${PORTVERSION}-tb+fn+fx+sm
 EXTRACT_SUFX=	.xpi
Index: textproc/yi-hunspell/Makefile
===================================================================
--- textproc/yi-hunspell/Makefile
+++ textproc/yi-hunspell/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	hunspell
 PORTVERSION=	0.0.3
 CATEGORIES=	textproc
-MASTER_SITES=	MOZILLA_EXTENDED/addons/222538
+MASTER_SITES=	MOZILLA_ADDONS/addons/222538
 PKGNAMEPREFIX=	yi-
 DISTNAME=	yiddish_spell_checker_yivo-${PORTVERSION}-sm+fn+fx+tb
 EXTRACT_SUFX=	.xpi
Index: textproc/zu-hunspell/Makefile
===================================================================
--- textproc/zu-hunspell/Makefile
+++ textproc/zu-hunspell/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	20110323
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	MOZILLA_EXTENDED/addons/46490
+MASTER_SITES=	MOZILLA_ADDONS/addons/46490
 PKGNAMEPREFIX=	zu-
 DISTNAME=	zulu_spell_checker-${PORTVERSION}-tb+fn+fx+sm
 EXTRACT_SUFX=	.xpi
Index: www/firefox-esr-i18n/Makefile
===================================================================
--- www/firefox-esr-i18n/Makefile
+++ www/firefox-esr-i18n/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	31.7.0
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}esr/linux-i686/xpi \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build2/linux-i686/xpi/
+		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build2/linux-i686/xpi
 PKGNAMEPREFIX=
 PKGNAMESUFFIX=	-esr-i18n
 DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}
Index: www/firefox-esr/Makefile
===================================================================
--- www/firefox-esr/Makefile
+++ www/firefox-esr/Makefile
@@ -7,7 +7,7 @@
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source/
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source
 PKGNAMESUFFIX=	-esr
 
 MAINTAINER=	gecko@FreeBSD.org
Index: www/firefox-i18n/Makefile
===================================================================
--- www/firefox-i18n/Makefile
+++ www/firefox-i18n/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	38.0.1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi/
+		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
 PKGNAMEPREFIX=
 DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}
 DIST_SUBDIR=	xpi/${DISTNAME}
Index: www/firefox/Makefile
===================================================================
--- www/firefox/Makefile
+++ www/firefox/Makefile
@@ -7,7 +7,7 @@
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
Index: www/libxul/Makefile
===================================================================
--- www/libxul/Makefile
+++ www/libxul/Makefile
@@ -5,7 +5,7 @@
 DISTVERSION=	31.7.0
 CATEGORIES?=	www devel
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source \
-		https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${DISTVERSION}esr-candidates/build2/source/
+		MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source
 DISTNAME=	firefox-${DISTVERSION}esr.source
 
 MAINTAINER?=	gecko@FreeBSD.org
Index: www/linux-firefox/Makefile
===================================================================
--- www/linux-firefox/Makefile
+++ www/linux-firefox/Makefile
@@ -6,7 +6,7 @@
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US/
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
Index: www/linux-seamonkey/Makefile
===================================================================
--- www/linux-seamonkey/Makefile
+++ www/linux-seamonkey/Makefile
@@ -5,7 +5,7 @@
 DISTVERSION=	2.33.1
 CATEGORIES=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US/
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
Index: www/seamonkey-i18n/Makefile
===================================================================
--- www/seamonkey-i18n/Makefile
+++ www/seamonkey-i18n/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	2.33.1
 CATEGORIES=	www mail news editors irc
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack/
+		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack
 PKGNAMEPREFIX=
 DISTFILES=	${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./}
 DIST_SUBDIR=	xpi/${DISTNAME}
Index: www/seamonkey/Makefile
===================================================================
--- www/seamonkey/Makefile
+++ www/seamonkey/Makefile
@@ -6,7 +6,7 @@
 PORTREVISION=	3
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
 DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 
Index: www/xpi-adblock/Makefile.xpi
===================================================================
--- www/xpi-adblock/Makefile.xpi
+++ www/xpi-adblock/Makefile.xpi
@@ -58,8 +58,6 @@
 # xpi ports do not depend on their master applications. You can install an
 # extension before the app and run relink when the app is present.
 
-MASTER_SITE_MOZILLA_ADDONS=	http://addons.cdn.mozilla.net/user-media/%SUBDIR%/
-
 .ifndef MASTER_SITES
 .ifdef XPI_NUM
 MASTER_SITES?=	MOZILLA_ADDONS/addons/${XPI_NUM}
Index: www/xpi-downthemall/Makefile
===================================================================
--- www/xpi-downthemall/Makefile
+++ www/xpi-downthemall/Makefile
@@ -5,13 +5,13 @@
 PORTVERSION=	2.0.17
 DISTVERSIONSUFFIX=	-fx+sm
 CATEGORIES=	www
-MASTER_SITES=	MOZILLA_EXTENDED/addons/201
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Lets you download all the links in a webpage and much more
 
 XPI_DISTNAME=	downthemall
 
+XPI_NUM=	201
 XPI_ID=		{DDC359D1-844A-42a7-9AA1-88A850A938A8}
 
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"