diff --git a/src/etc/Makefile b/src/etc/Makefile
index 4ee551df..57bd396e 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.248 2007/02/22 16:55:32 henning Exp $
+#	$OpenBSD: Makefile,v 1.249 2007/02/27 02:22:01 beck Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -17,7 +17,7 @@ BIN1=	changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \
 	hosts.lpd inetd.conf ksh.kshrc locate.rc man.conf monthly motd \
 	mrouted.conf myname netstart networks newsyslog.conf phones printcap \
 	protocols rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \
-	remote rpc security services shells spamd.conf syslog.conf weekly \
+	remote rpc security services shells syslog.conf weekly \
 	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
 	moduli pf.os sensorsd.conf ifstated.conf
 
@@ -341,7 +341,7 @@ distrib:
 DHSIZE=1024 1536 2048 3072 4096
 update-moduli:
 	( \
-		echo '#    $$OpenBSD: Makefile,v 1.248 2007/02/22 16:55:32 henning Exp $$'; \
+		echo '#    $$OpenBSD: Makefile,v 1.249 2007/02/27 02:22:01 beck Exp $$'; \
 		echo '# Time Type Tests Tries Size Generator Modulus'; \
 		( for i in ${DHSIZE}; do \
 			ssh-keygen -b $$i -G /dev/stdout; \
diff --git a/src/etc/mail/Makefile b/src/etc/mail/Makefile
index 83d3f9eb..8fc6665b 100644
--- a/src/etc/mail/Makefile
+++ b/src/etc/mail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2004/08/14 17:06:03 millert Exp $
+# $OpenBSD: Makefile,v 1.5 2007/02/27 02:22:01 beck Exp $
 #
 # Generate the various .db versions from their source files.
 # The sendmail .mc files are not built here.  They live in
@@ -43,6 +43,8 @@ distribution:
 	    ${DESTDIR}/etc/mail/trusted-users
 	${INSTALL} -c -o root -g wheel -m 644 virtusertable \
 	    ${DESTDIR}/etc/mail/virtusertable
+	${INSTALL} -c -o root -g wheel -m 644 spamd.conf \
+	    ${DESTDIR}/etc/mail/spamd.conf
 	makemap hash ${DESTDIR}/etc/mail/virtusertable < virtusertable
 	@for db in access.db aliases.db genericstable.db mailertable.db \
 	    virtusertable.db; do \
diff --git a/src/etc/spamd.conf b/src/etc/mail/spamd.conf
similarity index 97%
rename from src/etc/spamd.conf
rename to src/etc/mail/spamd.conf
index 6d55f1ce..aa282ab9 100644
--- a/src/etc/spamd.conf
+++ b/src/etc/mail/spamd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: spamd.conf,v 1.22 2007/02/25 04:45:28 marc Exp $
+# $OpenBSD: spamd.conf,v 1.1 2007/02/27 02:22:01 beck Exp $
 #
 # spamd config file, read by spamd-setup(8) for spamd(8)
 #