diff --git a/mail/dracmail/Makefile b/mail/dracmail/Makefile
index e8caa338b58c..288b8df35367 100644
--- a/mail/dracmail/Makefile
+++ b/mail/dracmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dracmail
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/dracmail/release/
 DISTNAME=	dracMail-${PORTVERSION}_release
@@ -10,40 +11,26 @@ DISTNAME=	dracMail-${PORTVERSION}_release
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DracMail is a webmail interface built using PHP
 
-RUN_DEPENDS+=	php:${PORTSDIR}/lang/php5
-
 USE_PHP+=	mysql imap dom tidy iconv mbstring
 USE_MYSQL=	yes
 NO_BUILD=	yes
-WWWOWN=		www
-WWWGRP=		${WWWOWN}
 
-PKGMESSAGE=	${WRKDIR}/${PORTNAME}/pkg-message
-SUB_FILES=      pkg-message
-PLIST_DIRSTRY=	%%WWWDIR%%
+SUB_FILES=	pkg-message
+PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 OPTIONS_DEFINE=	PGSQL APACHE LIGHTTPD
-OPTIONS_DEFAULT=	APACHE
+OPTIONS_DEFAULT=APACHE
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+PGSQL_USE=	PHP=pgsql
+APACHE_USE=	APACHE_RUN=22+
+LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/www/lighttpd
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PHP+=	pgsql
-.endif
-.if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=	22
-.endif
-.if ${PORT_OPTIONS:MLIGHTTPD}
-RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
-.endif
+post-extract:
+	@${MKDIR} ${WRKSRC}
+	-@${MV} ${WRKDIR}/* ${WRKSRC}
 
 do-install:
-	@${MKDIR} ${WWWDIR}
-	@${CP} -r ${WRKDIR}/* ${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	${CP} -rp ${WRKSRC}/* ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/dracmail/pkg-plist b/mail/dracmail/pkg-plist
index 9f871f488981..9336f037732f 100644
--- a/mail/dracmail/pkg-plist
+++ b/mail/dracmail/pkg-plist
@@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/INSTALL
 %%WWWDIR%%/LICENSE
 %%WWWDIR%%/api/SQL/dracmail.sql
@@ -7405,7 +7407,6 @@
 %%WWWDIR%%/objSynch.js
 %%WWWDIR%%/objThemes.js
 %%WWWDIR%%/objUIMenu.js
-%%WWWDIR%%/pkg-message
 %%WWWDIR%%/styles.css
 %%WWWDIR%%/tiny_mce/langs/en.js
 %%WWWDIR%%/tiny_mce/license.txt
@@ -8542,16 +8543,4 @@
 @dirrm %%WWWDIR%%/api/classes
 @dirrm %%WWWDIR%%/api/SQL
 @dirrmtry %%WWWDIR%%/api
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/src/ext-core/test/yui_2.6.0/yui/build/yuitest/assets/skins/sam
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/src/ext-core/test/yui_2.6.0/yui/build/logger/assets/skins/sam
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/src/ext-core/examples/tabs/images
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/src/ext-core/examples/rating/images
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/src/ext-core/examples/menu/images
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/src/ext-core/examples/lightbox/images
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/src/ext-core/examples/jsonp/images
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/src/ext-core/examples/combo
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/src/ext-core/examples/carousel/slides
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/src/ext-core/examples/carousel/images
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/resources/images/vista/tree
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/resources/images/vista/dd
-@exec mkdir -p %D/%%WWWDIR%%/ext-3.3.0/examples/spinner/images
+@dirrmtry %%WWWDIR%%