diff --git a/mail/atmail/Makefile b/mail/atmail/Makefile
index bfa3b1f464f0..f378c0722908 100644
--- a/mail/atmail/Makefile
+++ b/mail/atmail/Makefile
@@ -6,44 +6,26 @@ PORTVERSION=	1.0.4
 CATEGORIES=	mail
 MASTER_SITES=	http://atmail.org/download/
 DISTNAME=	atmailopen
-EXTRACT_SUFX=	.tgz
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source Webmail Client
 
+USES=		tar:tgz
 USE_PHP=	mysql pcre session
 WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
+PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
-OPTIONS_DEFINE=	LDAP MBSTRING
-MBSTRING_DESC= Support for UTF8 folder names
+OPTIONS_DEFINE=	LDAP MBSTRING ICONV
+MBSTRING_DESC=	Support for UTF8 folder names
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_PHP+=	ldap
-.endif
-
-.if ${PORT_OPTIONS:MMBSTRING}
-USE_PHP+=	mbstring
-.endif
-
-.if ${PORT_OPTIONS:MICONV}
-USE_PHP+=	iconv
-.endif
+LDAP_USE=	PHP=ldap
+MBSTRING_USE=	PHP=mbstring
+ICONV_USE=	PHP=iconv
 
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-	@${CHMOD} -R 755 ${WWWDIR}
-
-post-install:
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
-		>> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' \
-		>> ${TMPPLIST}
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
diff --git a/mail/atmail/files/pkg-message.in b/mail/atmail/files/pkg-message.in
index 3bfeda9a4110..ca6bb2e7c4da 100644
--- a/mail/atmail/files/pkg-message.in
+++ b/mail/atmail/files/pkg-message.in
@@ -2,16 +2,15 @@
 POST-INSTALL CONFIGURATION FOR ATMAIL
 =====================================
 
-1) Before the post-install of atmail ,please make sure
-your SMTP server work well first.
-   Better turn off magic_quotes_gpc setting in the 
-php.ini.
+1) Before the post-install of atmail, please make sure
+   your SMTP server work well first.
+   Better turn off magic_quotes_gpc setting in php.ini.
 
 2) Add the following to your Apache configuration, and
    restart the server:
 
    ### Add the AcceptPathInfo directive only for Apache 2.0.30 or later.
-   Alias /atmail %%WWWDIR%%/
+   Alias /atmail %%WWWDIR%%
    AcceptPathInfo On
    <Directory %%WWWDIR%%>
       AllowOverride None
diff --git a/mail/atmail/pkg-plist b/mail/atmail/pkg-plist
index 59332a00226c..fdff01b8622c 100644
--- a/mail/atmail/pkg-plist
+++ b/mail/atmail/pkg-plist
@@ -1,4 +1,6 @@
-@exec mkdir -p %D/www/atmail/users
+@mode 755
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/CHANGELOG
 %%WWWDIR%%/LICENSE
 %%WWWDIR%%/README