diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index 523af1a07d4..9af2d9fd45e 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/11/26 14:17:17 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT=	integer-only, fully Ogg Vorbis compliant decoder library
 
@@ -14,7 +14,7 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
-MASTER_SITES=	http://www.bsdfrog.org/OpenBSD/distfiles/                       
+MASTER_SITES=	http://distfiles.bsdfrog.org/                       
 
 BUILD_DEPENDS=	devel/autoconf/${AUTOCONF_VERSION} \
 		devel/automake/${AUTOMAKE_VERSION} \
diff --git a/databases/dbic++/Makefile b/databases/dbic++/Makefile
index 6b5d31ec1bc..6fc40f13794 100644
--- a/databases/dbic++/Makefile
+++ b/databases/dbic++/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2011/03/14 18:30:33 jeremy Exp $
+# $OpenBSD: Makefile,v 1.3 2011/04/02 16:56:42 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -24,7 +24,7 @@ PERMIT_DISTFILES_FTP=	Yes
 # .so shared library equivalent.
 WANTLIB =		e2fs-uuid m mysqlclient pcrecpp pq stdc++ sqlite3
 
-MASTER_SITES=		http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES=		http://distfiles.bsdfrog.org/
 
 BUILD_DEPENDS=		devel/cmake \
 			shells/bash
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index d2d8826985a..c06e456f462 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2010/11/15 23:22:07 espie Exp $
+# $OpenBSD: Makefile,v 1.82 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT=	free cross-platform WYSIWYG word processor
 
@@ -12,7 +12,7 @@ REVISION=	1
 # DejaVu Serif.: fixes font corruption issue on machines where
 # msttcorefonts are not installed.
 PATCHFILES=	abiword-dejavu.patch:0
-MASTER_SITES0=	http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES0=	http://distfiles.bsdfrog.org/
 
 SHARED_LIBS +=	abiword-2.8 0.0 # .0.0
 
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 4fc0ff13cb4..721be0445bb 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.62 2010/12/20 12:02:12 jasper Exp $
+# $OpenBSD: Makefile,v 1.63 2011/04/02 16:56:42 ajacoutot Exp $
 # $FreeBSD: Makefile,v 1.10 1998/03/28 14:36:34 steve Exp $
 
 COMMENT=		X11/Motif GUI text editor
@@ -14,7 +14,7 @@ CATEGORIES=		editors x11
 MASTER_SITES=		http://www.nedit.org/ftp/v5_5/ \
 			${MASTER_SITE_SOURCEFORGE:=nedit/}
 
-MASTER_SITES0=		http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES0=		http://distfiles.bsdfrog.org/
 
 MASTER_SITES1=		http://distfiles.nl/
 
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index d33f87a0bf8..9c0dbaddcd4 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2011/04/02 16:22:05 jeremy Exp $
+# $OpenBSD: Makefile,v 1.4 2011/04/02 16:56:42 ajacoutot Exp $
 
 SHARED_ONLY =	Yes
 
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =	Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-MASTER_SITES =	http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES =	http://distfiles.bsdfrog.org/
 EXTRACT_SUFX =	.tar.bz2
 
 USE_GMAKE =	Yes
diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index 3356fd28c12..c91b2fab8e2 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2011/03/18 23:01:22 jeremy Exp $
+# $OpenBSD: Makefile,v 1.19 2011/04/02 16:56:42 ajacoutot Exp $
 
 SHARED_ONLY =	Yes
 
@@ -22,7 +22,7 @@ PERMIT_DISTFILES_CDROM = Yes
 PERMIT_DISTFILES_FTP =	Yes
 
 MASTER_SITES =	http://jruby.org.s3.amazonaws.com/downloads/${V}/
-MASTER_SITES0 =	http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES0 =	http://distfiles.bsdfrog.org/
 
 MODULES =	java
 MODJAVA_VER =	1.7+
diff --git a/mail/evolution-plugin-rss/Makefile b/mail/evolution-plugin-rss/Makefile
index cd64dd1ff71..0db655c55c1 100644
--- a/mail/evolution-plugin-rss/Makefile
+++ b/mail/evolution-plugin-rss/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2011/03/07 19:40:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2011/04/02 16:56:42 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -11,7 +11,7 @@ PKGNAME=		evolution-plugin-rss-0.2.2
 REVISION=		0
 
 # from upstream git
-MASTER_SITES0=		http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES0=		http://distfiles.bsdfrog.org/
 PATCHFILES=		ep-rss-EVOLUTION_RSS_0_2_2_CORRECTED.diff:0
 PATCH_DIST_STRIP=	-p1
 
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index ff4f7194725..634e7ddf205 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2011/03/03 13:42:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT-main=	driver for ZjStream wire protocol compatible printers
 COMMENT-cups=	Konica-Minolta foo2zjs command filter for CUPS
@@ -25,7 +25,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += c
 
-MASTER_SITES=	http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES=	http://distfiles.bsdfrog.org/
 
 MULTI_PACKAGES=	-main -cups
 
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 937289e7b74..eba7209a477 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2011/03/02 06:48:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2011/04/02 16:56:42 ajacoutot Exp $
 
 PKG_ARCH=		*
 
@@ -23,7 +23,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 # tarballs are only available for a 24 hour period
 #MASTER_SITES=		http://www.openprinting.org/download/foomatic/
-MASTER_SITES=		http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES=		http://distfiles.bsdfrog.org/
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--disable-ppds-to-cups
diff --git a/print/py-reportlab/reportlab/Makefile b/print/py-reportlab/reportlab/Makefile
index f3a5ffb9b04..81a4be530da 100644
--- a/print/py-reportlab/reportlab/Makefile
+++ b/print/py-reportlab/reportlab/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/11/20 09:48:40 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT=	PDF-generating toolkit for Python
 
@@ -22,7 +22,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://www.reportlab.org/ftp/
-MASTER_SITES0=	http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES0=	http://distfiles.bsdfrog.org/
 EXTRACT_SUFX=	.tgz
 
 MODULES=	lang/python
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 9409eb7ae89..8d88328461e 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2011/03/13 18:56:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT=	framework for granting privileged operations to users
 
@@ -25,7 +25,7 @@ WANTLIB += c dbus-1 dbus-glib-1 expat gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 gthread-2.0 pcre pthread z eggdbus-1
 
 #MASTER_SITES=	http://hal.freedesktop.org/releases/
-MASTER_SITES=	http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES=	http://distfiles.bsdfrog.org/
 
 MODULES=	textproc/intltool \
 		devel/gettext
diff --git a/www/mod_bandwidth/Makefile b/www/mod_bandwidth/Makefile
index c26d33785a9..0f4378adc08 100644
--- a/www/mod_bandwidth/Makefile
+++ b/www/mod_bandwidth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/09/26 17:45:13 sebastia Exp $
+# $OpenBSD: Makefile,v 1.10 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT=	bandwidth limiter for Apache
 
@@ -8,9 +8,9 @@ DISTFILES=	mod_bandwidth.c cleanlink.pl:0
 DISTNAME=	mod_bandwidth-${V}
 CATEGORIES=     www
 MASTER_SITES=	ftp://ftp.cohprog.com/pub/apache/module/1.3.0/ \
-		http://www.bsdfrog.org/OpenBSD/distfiles/mod_bandwidth/1.3.0/
+		http://distfiles.bsdfrog.org/mod_bandwidth/1.3.0/
 MASTER_SITES0=	ftp://ftp.cohprog.com/pub/apache/module/ \
-		http://www.bsdfrog.org/OpenBSD/distfiles/mod_bandwidth/
+		http://distfiles.bsdfrog.org/mod_bandwidth/
 
 HOMEPAGE=	http://www.cohprog.com/mod_bandwidth.html
 
diff --git a/www/myreview/Makefile b/www/myreview/Makefile
index 87e3d79c8e0..6373ecd6c25 100644
--- a/www/myreview/Makefile
+++ b/www/myreview/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/11/22 08:36:49 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT=	web-based conference management software
 
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES=	http://distfiles.bsdfrog.org/
 MASTER_SITES0=	http://www.lri.fr/~rigaux/
 
 EXTRACT_ONLY=
diff --git a/x11/farsi-bfonts-ttf/Makefile b/x11/farsi-bfonts-ttf/Makefile
index bed29579f75..07bbcb164b3 100644
--- a/x11/farsi-bfonts-ttf/Makefile
+++ b/x11/farsi-bfonts-ttf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/11/22 08:36:56 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT=	farsi bornaray fonts
 
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_CDROM= No license
 PERMIT_DISTFILES_FTP=	No license
 
 MASTER_SITES=	http://www.bornaray.com/download/fonts/
-MASTER_SITES0=	http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES0=	http://distfiles.bsdfrog.org/
 
 EXTRACT_SUFX=	.exe
 BUILD_DEPENDS += archivers/unzip
diff --git a/x11/gnome/development-monitor/Makefile b/x11/gnome/development-monitor/Makefile
index 0b86db235ca..a2962c29d2f 100644
--- a/x11/gnome/development-monitor/Makefile
+++ b/x11/gnome/development-monitor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/11/22 08:36:57 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT=	follow GNOME development activity
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES=	http://distfiles.bsdfrog.org/
 
 MODULES=	lang/python \
 		x11/gnome
diff --git a/x11/gnome/libslab/Makefile b/x11/gnome/libslab/Makefile
index 464cd0a5b5c..29a9be3480c 100644
--- a/x11/gnome/libslab/Makefile
+++ b/x11/gnome/libslab/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2010/11/22 08:36:58 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT=	interface components library
 
@@ -8,7 +8,7 @@ GNOME_VERSION=	2.30.0
 SHARED_LIBS +=  slab                 0.0      # 2.0
 
 # bring in some fixes from upstream GIT
-MASTER_SITES0=	http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES0=	http://distfiles.bsdfrog.org/
 PATCHFILES=	libslab-git-20101025.diff:0
 PATCH_DIST_STRIP= -p1
 
diff --git a/x11/gnome/session/Makefile b/x11/gnome/session/Makefile
index 7c51f3fa822..b9b422b0847 100644
--- a/x11/gnome/session/Makefile
+++ b/x11/gnome/session/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.137 2011/03/26 15:04:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.138 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT=		GNOME session
 
@@ -12,7 +12,7 @@ CATEGORIES=		x11
 # XXX when bug-buddy is installed, all debug messages are print in
 # .xsession, we do not want that
 # https://bugzilla.gnome.org/show_bug.cgi?id=622068
-MASTER_SITES0=	http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES0=	http://distfiles.bsdfrog.org/
 PATCHFILES=	gs-bug-buddy-debug.2.diff:0
 
 # GPLv2/LGPLv2/GFDLv1.1
diff --git a/x11/slim-themes/Makefile b/x11/slim-themes/Makefile
index 0598de317f2..75b093cbb2b 100644
--- a/x11/slim-themes/Makefile
+++ b/x11/slim-themes/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2011/03/24 22:01:08 landry Exp $
+# $OpenBSD: Makefile,v 1.7 2011/04/02 16:56:42 ajacoutot Exp $
 
 COMMENT=	slim themes bundle
 
@@ -16,7 +16,7 @@ PKG_ARCH=	*
 CATEGORIES=	x11
 HOMEPAGE=	http://slim.berlios.de/
 
-MASTER_SITES=	http://www.bsdfrog.org/OpenBSD/distfiles/slim/
+MASTER_SITES=	http://distfiles.bsdfrog.org/slim/
 
 # Freely available themes
 PERMIT_PACKAGE_CDROM=	Yes