Index: head/net-mgmt/vidalia/Makefile
===================================================================
--- head/net-mgmt/vidalia/Makefile	(revision 389283)
+++ head/net-mgmt/vidalia/Makefile	(revision 389284)
@@ -1,20 +1,16 @@
 # Created by: Fabian Keil <fk@fabiankeil.de>
 # $FreeBSD$
 
 PORTNAME=	vidalia
 PORTVERSION=	0.2.21
 CATEGORIES=	net-mgmt security
-MASTER_SITES=	https://archive.torproject.org/tor-package-archive/vidalia/ \
-		https://www.torproject.org/dist/vidalia/ \
-		http://tor.ccc.de/dist/vidalia/ \
-		http://tor.cyberarmy.at/dist/vidalia/ \
-		http://www.torservers.net/mirrors/torproject.org/dist/vidalia/
+MASTER_SITES=	TOR/vidalia
 
 MAINTAINER=	fk@fabiankeil.de
 COMMENT=	Graphical Tor controller based on Qt 4.x
 
 USES=		cmake
 INSTALLS_ICONS=	yes
 USE_QT4=	gui moc_build qmake_build rcc_build uic_build network xml linguist_build
 
 .include <bsd.port.mk>
Index: head/www/xpi-torbutton/Makefile
===================================================================
--- head/www/xpi-torbutton/Makefile	(revision 389283)
+++ head/www/xpi-torbutton/Makefile	(revision 389284)
@@ -1,16 +1,16 @@
 # Created by: Andreas Donig <a.donig@gmx.net>
 # $FreeBSD$
 
 PORTNAME=	torbutton
 PORTVERSION=	1.5.2
 CATEGORIES=	www
-MASTER_SITES=	https://www.torproject.org/dist/torbutton/
+MASTER_SITES=	TOR/torbutton
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Quickly toggle use of the Tor network
 
 XPI_NUM=	2275
 XPI_ID=		{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}
 
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>