diff --git a/net-p2p/phex/Makefile b/net-p2p/phex/Makefile
index 6dda833975a9..e03bc780b260 100644
--- a/net-p2p/phex/Makefile
+++ b/net-p2p/phex/Makefile
@@ -4,11 +4,13 @@
 PORTNAME=	phex
 PORTVERSION=	3.4.2.116
 CATEGORIES=	net-p2p java
-MASTER_SITES=	SF/${PORTNAME}/Phex%20Final%20Releases/Phex%203.4.2
+MASTER_SITES=	SF/${PORTNAME}/Phex%20Final%20Releases/Phex%20${PORTVERSION:R}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	jhale@FreeBSD.org
-COMMENT=	A Java multi platform and spyware free gnutella client
+COMMENT=	Multi-platform and spyware-free Gnutella client
+
+LICENSE=	GPLv2
 
 USES=		zip
 USE_JAVA=	yes
@@ -22,14 +24,13 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 PORTDOCS=	Phex_other.htm \
 		Undocumented.htm
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/readme/|} ${DOCSDIR}
-.endif
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/readme/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/phex/pkg-descr b/net-p2p/phex/pkg-descr
index 4935b17b0490..9b0b22ccdb3c 100644
--- a/net-p2p/phex/pkg-descr
+++ b/net-p2p/phex/pkg-descr
@@ -1,10 +1,8 @@
-Phex is a Java multi platform and spyware free gnutella client.
+Phex is a multi-platform and spyware-free Gnutella client written in Java.
 
-o Automatic search functionality to find new download candidates.
-o Download resuming across different hosts.
-o Advanced configuration options.
-o Passive searching for files.
-
-Visit these following web pages for more information:
+- Automatic search functionality to find new download candidates
+- Download resuming across different hosts
+- Advanced configuration options
+- Passive searching for files
 
 WWW: http://phex.sourceforge.net/