diff --git a/src/etc/Makefile b/src/etc/Makefile
index c3c7b464..c85b1877 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.178 2003/03/04 09:49:22 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.179 2003/03/08 19:03:44 beck Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -19,8 +19,8 @@ BIN1=	bootptab changelist ccd.conf csh.cshrc csh.login csh.logout \
 	myname netstart networks newsyslog.conf \
 	phones printcap protocols rbootd.conf rc rc.conf rc.local \
 	rc.securelevel rc.shutdown remote rpc security services \
-	shells syslog.conf weekly etc.${MACHINE}/disktab dhclient.conf \
-	mailer.conf
+	shells spamd.conf syslog.conf weekly etc.${MACHINE}/disktab \
+	dhclient.conf mailer.conf
 
 .if (${MACHINE} == "alpha" || ${MACHINE} == "hppa" || \
      ${MACHINE} == "i386" || ${MACHINE} == "macppc" || \
diff --git a/src/etc/spamd.conf b/src/etc/spamd.conf
new file mode 100644
index 00000000..b87ee3ef
--- /dev/null
+++ b/src/etc/spamd.conf
@@ -0,0 +1,52 @@
+# $OpenBSD: spamd.conf,v 1.1 2003/03/08 19:03:44 beck Exp $
+#
+# spamd config file, read by spamd-setup(8)
+#
+# Configures whitelists and blacklists for spamd
+#
+# 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 
+
+all:\
+	:spews1:spews2:china:korea:
+
+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:
+
+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:
+
+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:
+
+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:
+
+
+# Whitelists are done like this, and must be added to "all" after each
+# blacklist from which you want the addresses in the whitelist removed.
+#
+#whitelist:\
+#        :white:\
+#        :file=/var/mail/whitelist.txt