diff --git a/src/etc/spamd.conf b/src/etc/spamd.conf
index acc5b9da..88764793 100644
--- a/src/etc/spamd.conf
+++ b/src/etc/spamd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: spamd.conf,v 1.19 2006/07/11 05:40:33 djm Exp $
+# $OpenBSD: spamd.conf,v 1.20 2007/02/22 19:49:18 beck Exp $
 #
 # spamd config file, read by spamd-setup(8) for spamd(8)
 #
@@ -23,23 +23,26 @@
 # www.openbsd.org with, for instance, to www.de.openbsd.org
 
 all:\
-	:spews1:china:korea:
+	:uatraps:nixspam:china:korea:
 
-# 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.openbsd.org/spamd/spews_list_level1.txt.gz:
+# University of Alberta greytrap hits
+# Addresses stay in it for 24 hours from time they misbehave.
+uatraps:\
+        :black:\
+        :msg="Your address %A has sent mail to a ualberta.ca spamtrap\n\
+        within the last 24 hours":\
+        :method=http:\
+        :file=www.openbsd.org/spamd/traplist.gz
+
+# Nixspam recent sources list.
+# Mirrored from http://www.heise.de/ix/nixspam
+nixspam:\
+        :black:\
+        :msg="Your address %A is in in the nixspam list\n\
+	See http://www.heise.de/ix/nixspam/dnsbl_en/ for details":\
+        :method=http:\
+        :file=www.openbsd.org/spamd/nixspam.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.openbsd.org/spamd/spews_list_level2.txt.gz:
 
 # Mirrored from http://www.okean.com/chinacidr.txt
 china:\
@@ -57,17 +60,6 @@ korea:\
 	:method=http:\
 	:file=www.openbsd.org/spamd/koreacidr.txt.gz:
 
-#relaydb-black:\
-#	:black:\
-#	:msg="SPAM. Your address %A is in my relaydb list.":\
-#	:method=exec:\
-#	:file=/usr/local/bin/relaydb -4lb:
-
-#relaydb-white:\
-#	:white:\
-#	:method=exec:\
-#	:file=/usr/local/bin/relaydb -4lw:
-
 # Whitelists are done like this, and must be added to "all" after each
 # blacklist from which you want the addresses in the whitelist removed.
 #