diff --git a/security/amavisd-milter/Makefile b/security/amavisd-milter/Makefile
index 3bbbcda3b039..cee39b10b3d8 100644
--- a/security/amavisd-milter/Makefile
+++ b/security/amavisd-milter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	amavisd-milter
 PORTVERSION=	1.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -31,7 +31,7 @@ AMAVISDIR?=	/var/amavis
 RUNDIR=		/var/run/amavis
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-working-dir=tmp
+CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-working-dir=${AMAVISDIR}/tmp
 USE_RC_SUBR=	${PORTNAME}
 
 SUB_LIST=	AMAVISUSER=${AMAVISUSER} \
@@ -64,6 +64,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${INSTALL} -d -o ${AMAVISUSER} -g ${AMAVISGROUP} -m 755 ${STAGEDIR}${RUNDIR}
-	${INSTALL} -d -o ${AMAVISUSER} -g ${AMAVISGROUP} -m 750 ${STAGEDIR}${RUNDIR}/tmp
 
 .include <bsd.port.post.mk>
diff --git a/security/amavisd-milter/files/amavisd-milter.in b/security/amavisd-milter/files/amavisd-milter.in
index bb53c6ed8f50..ce401db337d8 100644
--- a/security/amavisd-milter/files/amavisd-milter.in
+++ b/security/amavisd-milter/files/amavisd-milter.in
@@ -37,7 +37,9 @@ start_postcmd="amavisd_milter_postcmd"
 
 amavisd_milter_postcmd()
 {
-	chmod ${amavisd_milter_socket_perm} ${amavisd_milter_socket}
+	if [ -e ${amavisd_milter_socket} ]; then
+		chmod ${amavisd_milter_socket_perm} ${amavisd_milter_socket}
+	fi
 }
 
 run_rc_command "$1"
diff --git a/security/amavisd-milter/pkg-plist b/security/amavisd-milter/pkg-plist
index a2eacc0ecbb8..c0c411afec5e 100644
--- a/security/amavisd-milter/pkg-plist
+++ b/security/amavisd-milter/pkg-plist
@@ -1,4 +1,3 @@
 sbin/amavisd-milter
 man/man8/amavisd-milter.8.gz
-@dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%RUNDIR%%/tmp
 @dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,755) %%RUNDIR%%