diff --git a/src/etc/mail/spamd.conf b/src/etc/mail/spamd.conf
index aa282ab9..f5af67b4 100644
--- a/src/etc/mail/spamd.conf
+++ b/src/etc/mail/spamd.conf
@@ -1,31 +1,30 @@
-# $OpenBSD: spamd.conf,v 1.1 2007/02/27 02:22:01 beck Exp $
+# $OpenBSD: spamd.conf,v 1.2 2007/03/06 10:29:44 jmc Exp $
 #
-# spamd config file, read by spamd-setup(8) for spamd(8)
+# spamd(8) configuration file, read by spamd-setup(8).
+# See also spamd.conf(5).
 #
-# See spamd.conf(5)
-#
-# Configures whitelists and blacklists for spamd
+# Configures lists for spamd(8).
 #
 # Strings follow getcap(3) convention escapes, other than you
 # can have a bare colon (:) inside a quoted string and it
 # will deal with it. See spamd-setup(8) for more details.
 #
 # "all" must be here, and defines the order in which lists are applied.
-# Whitelists apply to the previous blacklist. More than one whitelist
-# may be applied to each blacklist.
+# Lists specified with the :white: capability apply to the previous
+# list with a :black: capability.
 #
-# As of November 2004, a place to search for black lists is
+# As of November 2004, a place to search for blacklists is
 #     http://spamlinks.net/filter-bl.htm
 #
 # 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
+# www.openbsd.org with, for instance, to www.de.openbsd.org.
 
 all:\
 	:uatraps:nixspam:china:korea:
 
-# University of Alberta greytrap hits
+# University of Alberta greytrap hits.
 # Addresses stay in it for 24 hours from time they misbehave.
 uatraps:\
 	:black:\
@@ -59,10 +58,9 @@ korea:\
 	:method=http:\
 	:file=www.openbsd.org/spamd/koreacidr.txt.gz:
 
-# Whitelists are done like this, and must be added to "all" after each
-# blacklist from which you want the addresses in the whitelist removed.
+# An example of a list containing addresses which should not talk to spamd.
 #
-#whitelist:\
+#override:\
 #	:white:\
 #	:method=file:\
-#	:file=/var/db/whitelist.txt:
+#	:file=/var/db/override.txt: