diff --git a/infrastructure/templates/network.conf.template b/infrastructure/templates/network.conf.template
index 996282b6406..1739cbc6771 100644
--- a/infrastructure/templates/network.conf.template
+++ b/infrastructure/templates/network.conf.template
@@ -1,4 +1,4 @@
-# $OpenBSD: network.conf.template,v 1.95 2006/04/28 19:37:03 sturm Exp $
+# $OpenBSD: network.conf.template,v 1.96 2006/05/07 09:23:51 steven Exp $
 
 #
 # NEVER EDIT THIS FILE DIRECTLY!!!! 
@@ -51,14 +51,14 @@ MASTER_SITE_GNU+=	\
 	ftp://ftp.uu.net/archive/systems/gnu/ \
 	ftp://ftp.eu.uu.net/pub/gnu/ \
 	ftp://ftp.funet.fi/pub/gnu/prep/ \
-	ftp://ftp.leo.org/pub/comp/os/unix/gnu/ \
+	ftp://ftp.cs.tu-berlin.de/pub/gnu/ \
 	ftp://ftp.wustl.edu/pub/gnu/ \
 	ftp://ftp.kddilabs.jp/GNU/ \
 	ftp://ftp.mirror.ac.uk/sites/ftp.gnu.org/gnu/ \
 	ftp://sunsite.org.uk/package/gnu/ \
 	ftp://ftp.informatik.hu-berlin.de/pub/gnu/ \
-	ftp://ftp.rediris.es/mirror/gnu/ \
-	ftp://ftp.lip6.fr/pub/gnu/ \
+	ftp://ftp.rediris.es/mirror/gnu/gnu/ \
+	ftp://ftp.cs.univ-paris8.fr/mirrors/ftp.gnu.org/ \
 	ftp://ftp.chg.ru/pub/gnu/ \
 	ftp://ftp.uvsq.fr/pub/gnu/ \
   	ftp://ftp.sunet.se/pub/gnu/ \
@@ -140,7 +140,7 @@ MASTER_SITE_PERL_CPAN+=	\
 	ftp://ftp.auckland.ac.nz/pub/perl/CPAN/modules/by-module/ \
 	ftp://ftp.isu.net.sa/pub/CPAN/modules/by-module/ \
 	ftp://ftp.ucr.ac.cr/pub/Unix/CPAN/modules/by-module/ \
-	ftp://ftp.cs.colorado.edu/pub/perl/CPAN/modules/by-module/ \
+	ftp://ftp.duke.edu/pub/perl/modules/by-module/ \
 	ftp://cpan.pop-mg.com.br/pub/CPAN/modules/by-module/ \
 	ftp://ftp.is.co.za/programming/perl/CPAN/modules/by-module/ \
 	ftp://sunsite.org.uk/package/cpan/modules/by-module/ \