diff --git a/src/etc/spamd.conf b/src/etc/spamd.conf
index 5c279a34..c4e719ce 100644
--- a/src/etc/spamd.conf
+++ b/src/etc/spamd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: spamd.conf,v 1.8 2003/12/04 18:59:29 deraadt Exp $
+# $OpenBSD: spamd.conf,v 1.9 2004/01/21 08:07:39 deraadt Exp $
 #
 # spamd config file, read by spamd-setup(8) for spamd(8)
 #
@@ -17,44 +17,54 @@
 # As of Aug 2003, a place to search for black lists is
 #     http://spamlinks.port5.com/filter-bl.htm#ip
 #
+# Some of the URLs below point to www.openbsd.org locations.  Those
+# files are likely to be mirrored to other OpenBSD www mirrors located
+# around the world.  Hence, it is possible to edit this file and rewrite
+# www.openbsd.org with, for instance, to www.de.openbsd.org
 
 all:\
 	:spamhaus:china:korea:
 
+# Mirrored from http://spfilter.openrbl.org/data/sbl/SBL.cidr.bz2
 spamhaus:\
 	:black:\
 	:msg="SPAM. Your address %A is in the Spamhaus Block List\n\
-	See http://www.spamhaus.org/sbl for more details":\
+	See http://www.spamhaus.org/sbl and\
+	http://www.abuse.net/sbl.phtml?IP=%A for more details":\
 	:method=http:\
-	:file=spfilter.openrbl.org/data/sbl/SBL.cidr
+	:file=www.openbsd.org/spamd/SBL.cidr.gz
 
+# Mirrored from http://www.spews.org/spews_list_level1.txt
 spews1:\
 	:black:\
 	:msg="SPAM. Your address %A is in the spews level 1 database\n\
 	See http://www.spews.org/ask.cgi?x=%A for more details":\
 	:method=http:\
-	:file=www.spews.org/spews_list_level1.txt:
+	:file=www.openbsd.org/spamd/spews_list_level1.txt.gz
 
+# Mirrored from http://www.spews.org/spews_list_level2.txt
 spews2:\
 	:black:\
 	:msg="SPAM. Your address %A is in the spews level 2 database\n\
 	See http://www.spews.org/ask.cgi?x=%A for more details":\
 	:method=http:\
-	:file=www.spews.org/spews_list_level2.txt:
+	:file=www.openbsd.org/spamd/spews_list_level2.txt.gz
 
+# Mirrored from http://www.okean.com/chinacidr.txt
 china:\
 	:black:\
 	:msg="SPAM. Your address %A appears to be from China\n\
 	See http://www.okean.com/asianspamblocks.html for more details":\
 	:method=http:\
-	:file=www.okean.com/chinacidr.txt:
+	:file=www.openbsd.org/spamd/chinacidr.txt.gz
 
+# Mirrored from http://www.okean.com/koreacidr.txt
 korea:\
 	:black:\
 	:msg="SPAM. Your address %A appears to be from Korea\n\
 	See http://www.okean.com/asianspamblocks.html for more details":\
 	:method=http:\
-	:file=www.okean.com/koreacidr.txt:
+	:file=www.openbsd.org/spamd/koreacidr.txt.gz
 
 
 # Whitelists are done like this, and must be added to "all" after each