diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 7250e18b05ef..6f39a10c67c5 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.134 2004/07/18 19:16:31 jlam Exp $
+# $NetBSD: Makefile,v 1.135 2004/07/18 23:42:48 jlam Exp $
 
 DISTNAME=	postfix-2.1.3
 CATEGORIES=	mail
@@ -149,6 +149,7 @@ POSTFIX_CONF_FILES+=	src/global/mail_params.h
 FILES_SUBST+=	SHAREDIR=${SHAREDIR}
 MESSAGE_SUBST+=	SHAREDIR=${SHAREDIR}
 PLIST_SUBST+=	POSTFIX_SPOOL=${POSTFIX_SPOOL}
+FILES_SUBST+=	POSTFIX_SPOOL=${POSTFIX_SPOOL}
 
 PKG_GROUPS?=	postfix maildrop
 PKG_USERS?=	postfix:postfix::Postfix\\ User:${POSTFIX_SPOOL}
diff --git a/mail/postfix/files/postfix.sh b/mail/postfix/files/postfix.sh
index a91f71045037..312a00a1d2c9 100644
--- a/mail/postfix/files/postfix.sh
+++ b/mail/postfix/files/postfix.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: postfix.sh,v 1.1 2004/03/07 10:13:46 grant Exp $
+# $NetBSD: postfix.sh,v 1.2 2004/07/18 23:42:48 jlam Exp $
 #
 
 # PROVIDE: mail
@@ -18,7 +18,7 @@ start_cmd="${name} "'${rc_arg}'
 stop_cmd=$start_cmd
 reload_cmd=$start_cmd
 extra_commands="reload"
-spooletcdir="/var/spool/${name}/etc"
+spooletcdir="@POSTFIX_SPOOL@/etc"
 required_dirs=$spooletcdir
 
 postfix_precmd()