diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index 9f0185b5f586..8a0881176e8f 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -8,9 +8,7 @@
 PORTNAME=	gnustep-back
 PORTVERSION=	0.8.2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/ \
-		http://archive.progeny.com/gnustep/core/ \
-		ftp://ftp.easynet.nl/mirror/GNUstep/core/
+MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
 
 MAINTAINER=	dinoex@FreeBSD.org
 
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index de6e88f4445b..58d67284a9c5 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -12,9 +12,12 @@ PORTVERSION=	0.8.2
 PORTVERSION=	0.7.6
 .endif
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/ \
-		http://archive.progeny.com/gnustep/core/ \
-		ftp://ftp.easynet.nl/mirror/GNUstep/core/
+.if defined(GNUSTEP_GUI_DEVEL)
+MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
+.else
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	dinoex
+.endif
 
 MAINTAINER=	dinoex@FreeBSD.org
 
diff --git a/x11-toolkits/gnustep-xgps/Makefile b/x11-toolkits/gnustep-xgps/Makefile
index f54da94c4640..56999bd57f85 100644
--- a/x11-toolkits/gnustep-xgps/Makefile
+++ b/x11-toolkits/gnustep-xgps/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	gnustep-xgps
 PORTVERSION=	0.7.6
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
+#MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	dinoex
 
 MAINTAINER=	dinoex@FreeBSD.org