diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile
index 71c7286b995..66fe0dd7080 100644
--- a/chinese/arphicttf/Makefile
+++ b/chinese/arphicttf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2004/12/03 04:04:10 kevlo Exp $
+# $OpenBSD: Makefile,v 1.12 2006/04/08 20:28:36 sturm Exp $
 
 COMMENT=	"chinese big5/gb truetype fonts"
 
@@ -13,8 +13,7 @@ PERMIT_DISTFILES_FTP=   Yes
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 
-MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/keith/ \
-		ftp://ftp.shellhung.org/pub/OpenBSD/packages/chinese/
+MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/keith/
 
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
diff --git a/chinese/crxvt/Makefile b/chinese/crxvt/Makefile
index b85483f0895..07eea03a199 100644
--- a/chinese/crxvt/Makefile
+++ b/chinese/crxvt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2004/11/21 21:51:36 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2006/04/08 20:28:36 sturm Exp $
 
 COMMENT=	"Chinese(Big5) VT100 terminal emulator for X"
 
@@ -6,8 +6,7 @@ DISTNAME=       crxvt-2.10-2
 PKGNAME=        zh-crxvt-2.10.2
 CATEGORIES=     chinese 
 
-MASTER_SITES=   ftp://ftp.linux.org.tw/pub/xcin/old/ \
-		ftp://ftp.shellhung.org/pub/OpenBSD/packages/chinese/
+MASTER_SITES=   ftp://ftp.linux.org.tw/pub/xcin/old/
 
 MAINTAINER=     Kevin Lo <kevlo@openbsd.org>
 
diff --git a/chinese/py-zhCodecs/Makefile b/chinese/py-zhCodecs/Makefile
index ca7fcc2daf6..d34ee526f22 100644
--- a/chinese/py-zhCodecs/Makefile
+++ b/chinese/py-zhCodecs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2005/09/23 19:36:02 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.8 2006/04/08 20:28:36 sturm Exp $
 
 COMMENT=	"Python Unicode codecs for Chinese charsets"
 
@@ -15,8 +15,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	ftp://ftp.shellhung.org/pub/OpenBSD/packages/chinese/
-
 MODULES=	lang/python
 
 MODPY_DISTUTILS_INSTALLARGS=	-O1
diff --git a/chinese/xcin/Makefile b/chinese/xcin/Makefile
index cc6c43775a7..e6063cfcef6 100644
--- a/chinese/xcin/Makefile
+++ b/chinese/xcin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2004/11/21 21:51:36 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2006/04/08 20:28:36 sturm Exp $
 
 COMMENT=	"chinese input utility for X"
 
@@ -6,8 +6,7 @@ DISTNAME=	xcin-2.3.04-3
 PKGNAME=	zh-xcin-2.3.04
 CATEGORIES=	chinese
 
-MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/old/ \
-		ftp://ftp.shellhung.org/pub/OpenBSD/packages/chinese/
+MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/old/
 
 HOMEPAGE=	http://xcin.linux.org.tw/
 
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index e60e3ec963f..c70352f5a49 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.64 2006/02/28 16:27:52 bernd Exp $
+# $OpenBSD: Makefile,v 1.65 2006/04/08 20:28:36 sturm Exp $
 
 COMMENT=	"Open source LDAP software (client)"
 COMMENT-server=	"Open source LDAP software (server)"
@@ -31,13 +31,11 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c crypto ssl
 
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
-		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
-		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/openldap/openldap-release/ \
 		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \
 		http://www.unibase.cz/ldapcz/Programy/Free/OpenLDAP/openldap-release/ \
-		ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ \
-		ftp://ftp.shellhung.org/pub/OpenLDAP/openldap-release/
+		ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/
 
 EXTRACT_SUFX=		.tgz
 
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 8811841a3c1..c40d9802b30 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2006/01/08 01:01:18 steven Exp $
+# $OpenBSD: Makefile,v 1.31 2006/04/08 20:28:36 sturm Exp $
 
 COMMENT=	"IJG's JPEG compression utilities"
 
@@ -6,8 +6,7 @@ DISTNAME=	jpegsrc.v6b
 PKGNAME=	jpeg-6bp3
 SHARED_LIBS=	jpeg	62.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.uu.net/graphics/jpeg/ \
-		ftp://ftp.shellhung.org/pub/Mirror/enlightenment/enlightenment/libs/
+MASTER_SITES=	ftp://ftp.uu.net/graphics/jpeg/
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 2d2a9a28937..1905a3c5353 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2006/01/21 23:43:37 steven Exp $
+# $OpenBSD: Makefile,v 1.42 2006/04/08 20:28:36 sturm Exp $
 
 COMMENT=	"HTML editor for experienced web designers"
 
@@ -11,10 +11,8 @@ HOMEPAGE=	http://bluefish.openoffice.nl/
 MAINTAINER=	Damien Couderc <couderc@openbsd.org>
 
 MASTER_SITES=	http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/ \
-		ftp://bluefish.advancecreations.com/bluefish/downloads/ \
 		http://bluefish.mrball.net/downloads/ \
-		ftp://ftp.ratisbona.com/pub/bluefish/downloads/ \
-		http://bluefish.shellhung.org/downloads/
+		ftp://ftp.ratisbona.com/pub/bluefish/downloads/
 
 # GPL
 PERMIT_PACKAGE_CDROM=   Yes