diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index c5a96e0c50a2..00ef8dc5ee15 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.627 2006/06/08 00:15:09 rpaulo Exp $
+# $NetBSD: mi,v 1.628 2006/06/09 21:19:40 tron Exp $
 .						base-sys-root
 ./altroot					base-sys-root
 ./bin						base-sys-root
@@ -3767,13 +3767,11 @@
 ./var/run					base-sys-root
 ./var/rwho					base-netutil-root
 ./var/spool					base-sys-root
-./var/spool/clientmqueue			base-obsolete		obsolete
 ./var/spool/ftp					base-netutil-root
 ./var/spool/ftp/bin				base-netutil-root
 ./var/spool/ftp/etc				base-netutil-root
 ./var/spool/ftp/hidden				base-netutil-root
 ./var/spool/lock				base-sys-root
-./var/spool/mqueue				base-obsolete		obsolete
 ./var/spool/output				base-lpr-root
 ./var/spool/output/lpd				base-lpr-root
 ./var/spool/postfix				base-postfix-root
diff --git a/usr.sbin/postinstall/postinstall b/usr.sbin/postinstall/postinstall
index 9863c6735881..6d63599cfcad 100755
--- a/usr.sbin/postinstall/postinstall
+++ b/usr.sbin/postinstall/postinstall
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.17 2006/06/09 12:18:30 tron Exp $
+# $NetBSD: postinstall,v 1.18 2006/06/09 21:19:40 tron Exp $
 #
 # Copyright (c) 2002-2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -792,10 +792,10 @@ do_sendmail()
 		return 0
 	fi
 
-	for f in mail/helpfile mail/local-host-names mail/sendmail.cf \
-	    mail/submit.cf rc.d/sendmail rc.d/smmsp; do
-		fd=/etc/${f}
-		[ -e "${DEST_DIR}${fd}" ] && echo "${fd}"
+	for f in /etc/mail/helpfile /etc/mail/local-host-names \
+	    /etc/mail/sendmail.cf /etc/mail/submit.cf /etc/rc.d/sendmail \
+	    /etc/rc.d/smmsp /var/spool/clientmqueue /var/spool/mqueue; do
+		[ -e "${DEST_DIR}${f}" ] && echo "${f}"
 	done | obsolete_paths ${op}
 	failed=$(( ${failed} + $? ))