diff --git a/distrib/notes/mirrors b/distrib/notes/mirrors
index 6a008b94a94e..71e53c08b5be 100644
--- a/distrib/notes/mirrors
+++ b/distrib/notes/mirrors
@@ -1,97 +1,107 @@
 NetBSD Mirror Site List
-The following sites mirror NetBSD as of Sep 30, 1996.
 
-Host name               Services Provided
----- ----               -------- --------
-ftp.netbsd.org          Anonymous FTP
-
-	FTP path:	ftp://ftp.netbsd.org/pub/NetBSD
-
-sup.netbsd.org          SUP
-
-	SUP:	See ftp://ftp.netbsd.org/pub/NetBSD/sup/README.sup 
-
-ftp.iastate.edu         Anonymous FTP, AFS
-
-	FTP path:	ftp://ftp.iastate.edu/pub/netbsd
-	AFS path:	/afs/iastate.edu/public/ftp/pub/netbsd
-
-ftp.eecs.umich.edu      Anonymous FTP
-
-	FTP path:	ftp://ftp.eecs.umich.edu/BSD/NetBSD
-
-ftp.cs.umn.edu          Anonymous FTP, SUP
-
-	FTP path:	ftp://ftp.cs.umn.edu/packages/NetBSD
-	SUP:	hostbase=/ftp/ftp/packages/NetBSD, collections are the same as on sup.NetBSD.ORG
-
-ftp.cslab.vt.edu        Anonymous FTP
-
-	FTP path:	ftp://ftp.cslab.vt.edu/pub/NetBSD
-
-ftp.op.net              Anonymous FTP
-
-	FTP path:	ftp://ftp.op.net/pub/NetBSD
-
-ftp.cetlink.net         Anonymous FTP, SUP
-
-	FTP path:	ftp://ftp.cetlink.net/pub/NetBSD
-	SUP:	sup.cetlink.net hostbase=/a/anon_ftp/pub
-
-netbsd.rmit.edu.au      Anonymous FTP, SUP
-
-	FTP path:	ftp://netbsd.rmit.edu.au/pub/NetBSD
-	SUP:	ftp://netbsd.rmit.edu.au/README.sup
-
-ftp.coppe.ufrj.br       Anonymous FTP
-
-	FTP path:	ftp://ftp.coppe.ufrj.br/mirror/netbsd
-
-ftp.cevis.uni-Bremen.de Anonymous FTP
-
-	FTP path:	ftp://ftp.cevis.uni-Bremen.de/pub/comp/os/NetBSD
-
-netbsd.wifo.uni-mannheim.de Anonymous FTP, SUP
-
-	FTP path:	ftp://netbsd.wifo.uni-mannheim.de/pub/NetBSD
-	SUP:	See ftp://netbsd.wifo.uni-mannheim.de/pub/NetBSD/sup/cfg-files/normal
-
-ftp.uni-regensburg.de   Anonymous FTP
-
-	FTP path:	ftp://ftp.uni-regensburg.de/pub/comp/os/NetBSD/
-
-ftp.uni-trier.de        Anonymous FTP, SUP
-
-	FTP path:	ftp://ftp.uni-trier.de/pub/unix/systems/NetBSD
-	SUP:	use host=sup.uni-trier.de, hostbase=/ftp/pub/unix/systems/NetBSD
-		collections are the same as on sup.NetBSD.ORG
-
-netbsd.tohoku.ac.jp     Anonymous FTP
-
-	FTP path:	ftp://netbsd.tohoku.ac.jp/NetBSD
-
-ftp.cs.uit.no           Anonymous FTP, SUP
-
-	FTP path:	ftp://ftp.cs.uit.no/pub/NetBSD
-	SUP:	Get the file README.sup via anonymous ftp, and read it.
-
-ftp.ntnu.no             Anonymous FTP
-
-	FTP path:	ftp://ftp.ntnu.no/pub/NetBSD/
-
-skarven.itea.ntnu.no    SUP
-
-	SUP:	Use this line as your sup file to get /usr/README.supinfo-skarven:
-		current release=supinfo host=skarven.itea.ntnu.no use-rel-suffix 
-		backup delete old base=/usr prefix=/usr hostbase=/supmirror
-
-ftp.stacken.kth.se      Anonymous FTP
-
-	FTP path:	ftp://ftp.stacken.kth.se/pub/OS/NetBSD
-
-ftp.sunet.se            Anonymous FTP
-
-	FTP path:	ftp://ftp.sunet.se/pub/os/NetBSD
+The following sites mirror NetBSD as of Sep 22, 1997
 
 If you wish to become a distribution site for NetBSD, contact
 mirrors@netbsd.org.
+
+
+	FTP mirrors
+	-----------
+
+Australia
+
+*   ftp://ftp.au.netbsd.org/pub/NetBSD
+
+Brazil
+
+*   ftp://ftp.ravel.ufrj.br/pub/NetBSD
+
+Germany
+
+*   ftp://ftp.de.netbsd.org/pub/NetBSD
+
+*   ftp://ftp.uni-regensburg.de/pub/comp/os/NetBSD
+
+Japan
+
+*   ftp://netbsd.tohoku.ac.jp/NetBSD
+
+Netherlands
+
+*   ftp://ftp.nl.netbsd.org/pub/comp/NetBSD
+
+Norway
+
+*   ftp://ftp.ntnu.no/pub/NetBSD
+
+*   ftp://skarven.itea.ntnu.no/pub/NetBSD
+
+Sweden
+
+*   ftp://ftp.stacken.kth.se/pub/OS/NetBSD
+
+*   ftp://ftp.sunet.se/pub/os/NetBSD
+
+UK
+
+*   ftp://ftp.DOMINO.ORG/pub/NetBSD
+
+USA
+
+*   ftp://ftp.netbsd.org/pub/NetBSD
+
+*   ftp://ftp.cs.umn.edu/pub/NetBSD
+
+*   ftp://ftp.cslab.vt.edu/pub/NetBSD
+
+*   ftp://ftp.eecs.umich.edu/pub/NetBSD
+
+*   ftp://ftp.iastate.edu/pub/netbsd
+
+*   ftp://ftp.op.net/pub/NetBSD
+
+
+	SUP mirrors
+	-----------
+
+Australia
+
+* ftp.au.netbsd.org
+  Instructions: ftp://sup.au.netbsd.org/pub/NetBSD/sup/README.sup
+
+Germany
+
+* ftp.de.netbsd.org
+  Instructions: ftp://sup.de.netbsd.org/pub/NetBSD/sup/supfile.example
+
+Norway
+
+* skarven.itea.ntnu.no
+  Instructions: Use this line as your sup file to get /usr/README.supinfo-
+  skarven:current release=supinfo host=skarven.itea.ntnu.no use-rel-suffix
+  backup delete old base=/usr prefix=/usr hostbase=/supmirror
+
+UK
+
+* ftp.domino.org
+  Instructions: See ftp://ftp.netbsd.org/pub/NetBSD/sup/README.sup
+
+USA
+
+* sup.netbsd.org
+  Instructions: See ftp://ftp.netbsd.org/pub/NetBSD/sup/README.sup
+
+* ftp.cs.umn.edu
+  Instructions: hostbase=/ftp/ftp/packages/NetBSD, collections are the same
+  as on sup.NetBSD.ORG
+
+
+	AFS mirrors
+	-----------
+
+USA
+
+* ftp.iastate.edu
+  AFS path: /afs/iastate.edu/public/ftp/pub/netbsd
+