diff --git a/www/freeway/Makefile b/www/freeway/Makefile
index 61514ea93501..7da023a5625e 100644
--- a/www/freeway/Makefile
+++ b/www/freeway/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}-ecom/Freeway/${PORTVERSION}%20Sathish
 DISTNAME=	${PORTNAME}_${PORTVERSION:S,.,_,g}
 
-MAINTAINER=	wenheping@gmail.com
-COMMENT=	A Advanced Open Source eCommerce Platform
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Advanced Open Source eCommerce Platform
 
 USE_PHP=	mysql
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -16,18 +16,16 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-	@${CHMOD} -R 755 ${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
+	@${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
 
 post-install:
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
-		>> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${CHMOD} 755 -R ${WWWDIR}' \
+	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}' \
+		 > ${TMPPLIST}
+	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}' \
 		>> ${TMPPLIST}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/freeway/pkg-descr b/www/freeway/pkg-descr
index 458f7e48d2c0..06546b983bbd 100644
--- a/www/freeway/pkg-descr
+++ b/www/freeway/pkg-descr
@@ -8,4 +8,4 @@ other selling methods.
 You will find Freeway has very strong CRM features as
 well as a useful and simple CMS as well. 
 
-WWW:	http://www.openfreeway.org/
+WWW: http://www.openfreeway.org/