diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 90fb13256cca..794738549f5c 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	cmp3
 PORTVERSION=	2.0.p5
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.personal.psu.edu/users/n/k/nkk104/cmp3/
+MASTER_SITES=	http://bsd.tucows.stop.hu/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index 69de4bdcd4c5..7884e17ce3f5 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gnapster
 PORTVERSION=	1.5.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.faradic.net/~jasta/files/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gnapster
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME client for the online mp3 community called napster
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index d14e056a23d7..174907359799 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	gemdropx
 PORTVERSION=	0.9
 CATEGORIES=	games
-MASTER_SITES=	http://www.nbswebfx.com/downloads/ \
-		ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx
+MASTER_SITES=	http://www.nbswebfx.com/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An interesting one-player puzzle game for X
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index b4c50933b7fe..32174e30d4c8 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	nethack
 PORTVERSION=	3.3.1
 PORTREVISION=	1
 CATEGORIES?=	games
-MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh${PORTVERSION:S/.//g}/src/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	nethack
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index ab60ae5ef48f..7d28785f949e 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	nethack
 PORTVERSION=	3.4.0
 PORTREVISION=	1
 CATEGORIES?=	games
-MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh${PORTVERSION:S/.//g}/src/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	nethack
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz