diff --git a/x11/gnustep/back/Makefile b/x11/gnustep/back/Makefile
index d65cd1d09c0..33cf9daf1d1 100644
--- a/x11/gnustep/back/Makefile
+++ b/x11/gnustep/back/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2008/09/05 18:29:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2008/10/03 07:21:56 ajacoutot Exp $
 
 COMMENT=	GNUstep gui backend
 
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.gnustep.org/
 
 WANTLIB=	GL X11 Xt Xext Xmu c freetype m objc pthread z
 
-MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
+MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
 USE_X11=	Yes
 MODULES=	x11/gnustep
diff --git a/x11/gnustep/base/Makefile b/x11/gnustep/base/Makefile
index f0437d23b60..734f985e65d 100644
--- a/x11/gnustep/base/Makefile
+++ b/x11/gnustep/base/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2008/08/29 11:52:20 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2008/10/03 07:21:56 ajacoutot Exp $
 
 COMMENT=	GNUstep base library
 
@@ -18,7 +18,7 @@ WANTLIB=	c crypto gcrypt gpg-error m objc pthread ssl xml2 z
 WANTLIB+=	iberty
 .endif
 
-MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
+MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
 MODULES=	x11/gnustep \
 		devel/gettext
diff --git a/x11/gnustep/examples/Makefile b/x11/gnustep/examples/Makefile
index 3dd7cfba645..206f5f3ae9e 100644
--- a/x11/gnustep/examples/Makefile
+++ b/x11/gnustep/examples/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2008/06/23 11:00:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2008/10/03 07:21:56 ajacoutot Exp $
 
 COMMENT=	GNUstep example applications
 
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.gnustep.org/experience/examples.html
 
 WANTLIB=	GL GLU c m objc pthread
 
-MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
+MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
 USE_X11=	Yes
 MODULES=	x11/gnustep
diff --git a/x11/gnustep/gnustep.port.mk b/x11/gnustep/gnustep.port.mk
index 850c15f0b3f..b86145d45aa 100644
--- a/x11/gnustep/gnustep.port.mk
+++ b/x11/gnustep/gnustep.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: gnustep.port.mk,v 1.5 2007/12/10 16:18:22 ajacoutot Exp $
+# $OpenBSD: gnustep.port.mk,v 1.6 2008/10/03 07:21:56 ajacoutot Exp $
 
 # until tested on others
 ONLY_FOR_ARCHS=	i386 amd64
@@ -24,3 +24,5 @@ MAKE_ENV+=	INSTALL_AS_GROUP=${BINGRP}
 
 MAKE_ENV+=	messages=yes
 MAKE_ENV+=	debug=no
+
+MASTER_SITE_GNUSTEP= ftp://ftp.gnustep.org/pub/gnustep/
diff --git a/x11/gnustep/gui/Makefile b/x11/gnustep/gui/Makefile
index 21a7f264155..1b382c703ff 100644
--- a/x11/gnustep/gui/Makefile
+++ b/x11/gnustep/gui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2008/06/23 11:00:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2008/10/03 07:21:56 ajacoutot Exp $
 
 COMMENT=	GNUstep gui library
 
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.gnustep.org/
 
 WANTLIB=	c crypto m objc pthread ssl stdc++ tiff z
 
-MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
+MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
 MODULES=	x11/gnustep
 LIB_DEPENDS=	aspell.>=16::textproc/aspell/core \
diff --git a/x11/gnustep/make/Makefile b/x11/gnustep/make/Makefile
index 9778856fb38..06081aff54e 100644
--- a/x11/gnustep/make/Makefile
+++ b/x11/gnustep/make/Makefile
@@ -1,4 +1,6 @@
-# $OpenBSD: Makefile,v 1.13 2008/06/23 10:59:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2008/10/03 07:21:56 ajacoutot Exp $
+
+# WARNING: this port does NOT use the x11/gnustep MODULE
 
 PKG_ARCH=	*