diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 37d58b39a21..8b857279b55 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2002/04/15 20:04:44 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.3 2002/05/08 19:24:56 wcobb Exp $
 # Uses pthreads
 
 COMMENT=		"Music tracking tool for X11"
@@ -9,7 +9,7 @@ CATEGORIES=		audio
 NEED_VERSION=		1.504
 HOMEPAGE=		http://www.soundtracker.org/
 
-MAINTAINER=		Wilbern Cobb <vedge@csoft.org>
+MAINTAINER=		Wilbern Cobb <wcobb@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITE_SUBDIR=	v0.6
 MASTER_SITES=		http://www.soundtracker.org/dl/%SUBDIR%/ \
-			ftp://vedge.com.ar/pub/mirror/soundtracker/%SUBDIR%/
+			http://mirror.csoft.org/soundtracker/%SUBDIR%/
 
 LIB_DEPENDS=		gtk.1.2,gdk.1.2::x11/gtk+ \
 			intl.1::devel/gettext \
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index dd20b8acdc7..026dc2c328b 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2002/03/11 20:32:55 lebel Exp $
+# $OpenBSD: Makefile,v 1.23 2002/05/08 19:26:24 wcobb Exp $
 # Uses pthreads
 
 COMMENT=		"Multimedia player for the X Window System"
@@ -19,7 +19,7 @@ CATEGORIES=		audio
 NEED_VERSION=		1.507
 HOMEPAGE=		http://www.xmms.org
 
-MAINTAINER=		Wilbern Cobb <vedge@csoft.org>
+MAINTAINER=		Wilbern Cobb <wcobb@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -34,7 +34,6 @@ MASTER_SITES=		http://www.xmms.org/files/%SUBDIR%/ \
 			ftp://ftp.stealth.net/xmms/%SUBDIR%/
 
 MASTER_SITES0=		http://vedge.com.ar/hack/ \
-			ftp://vedge.com.ar/pub/xmms/ \
 			http://mirror.csoft.org/xmms/
 
 FLAVORS=		no_gnome no_esd no_vorbis no_mikmod
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index eae30d3ed57..6b2d97aff67 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2002/03/04 00:57:58 naddy Exp $
+# $OpenBSD: Makefile,v 1.2 2002/05/08 19:27:29 wcobb Exp $
 
 ONLY_FOR_ARCHS=		i386
 
@@ -9,7 +9,7 @@ CATEGORIES=		emulators games
 HOMEPAGE=		http://www.zsnes.com/
 NEED_VERSION=		1.507
 
-MAINTAINER=		Wilbern Cobb <vedge@csoft.org>
+MAINTAINER=		Wilbern Cobb <wcobb@openbsd.org>
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	zsnes
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index 88dc193d519..c2d54fbf40a 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2002/03/21 20:57:07 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2002/05/08 19:28:07 wcobb Exp $
 
 COMMENT=		"Rich city simulation game for X"
 
@@ -7,7 +7,7 @@ CATEGORIES=		games
 NEED_VERSION=		1.515
 HOMEPAGE=		http://www.floot.demon.co.uk/lincity.html
 
-MAINTAINER=		Wilbern Cobb <cobb@vedge.com.ar>
+MAINTAINER=		Wilbern Cobb <wcobb@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/shells/sash/Makefile b/shells/sash/Makefile
index 82d6379d688..fab80249f1f 100644
--- a/shells/sash/Makefile
+++ b/shells/sash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2002/03/13 13:26:59 lebel Exp $
+# $OpenBSD: Makefile,v 1.5 2002/05/08 19:28:39 wcobb Exp $
 
 COMMENT=		"stand-alone shell with built-in commands"
 
@@ -13,11 +13,10 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MAINTAINER=		Wilbern Cobb <cobb@vedge.com.ar>
+MAINTAINER=		Wilbern Cobb <wcobb@openbsd.org>
 
 MASTER_SITES=		http://www.canb.auug.org.au/~dbell/programs/ \
-			http://mirror.csoft.org/sash/ \
-			ftp://vedge.com.ar/pub/mirror/sash
+			http://mirror.csoft.org/sash/
 
 ALL_TARGET=		sash