diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 8a0e4b2323c2..646489b70707 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -2,24 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	openfire
-PORTVERSION=	4.2.1
-DISTVERSIONPREFIX=	v
+PORTVERSION=	4.2.2
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	net-im java
+MASTER_SITES=	https://github.com/igniterealtime/${PORTNAME}/releases/download/v${PORTVERSION}/
+DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Enterprise instant messaging server
 
 LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_FILE=	${WRKSRC}/LICENSE.html
 
 RUN_DEPENDS=	slf4j>=1.7.7:devel/slf4j
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	igniterealtime
-GH_PROJECT=	Openfire
-
 OPTIONS_DEFINE=	DOCS PLUGINS
 OPTIONS_DEFAULT=PLUGINS
 OPTIONS_SUB=	yes
@@ -35,17 +32,18 @@ NO_ARCH=	yes
 
 CPE_VENDOR=	igniterealtime
 
-ALL_TARGET=	openfire
-USE_RC_SUBR=	openfire
+ALL_TARGET=	${PORTNAME}
+USE_RC_SUBR=	${PORTNAME}
 SUB_FILES+=	pkg-message
 
+WRKSRC=		${WRKDIR}/${PORTNAME}_src
 BUILD_WRKSRC=	${WRKSRC}/build
-INSTALL_WRKSRC=	${WRKSRC}/target/openfire
+INSTALL_WRKSRC=	${WRKSRC}/target/${PORTNAME}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 PORTDOCS=	*
-VARLOG=		/var/log/openfire
-VARDB=		/var/db/openfire
-USERS=		openfire
+VARLOG=		/var/log/${PORTNAME}
+VARDB=		/var/db/${PORTNAME}
+USERS=		${PORTNAME}
 GROUPS=		${USERS}
 PLIST_SUB+=	VARLOG=${VARLOG} \
 		VARDB=${VARDB}
@@ -74,8 +72,8 @@ do-install:
 	${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/resources/security
 	${LN} -sf ${VARDB} ${STAGEDIR}${DATADIR}/embedded-db
 	${LN} -sf ${VARLOG} ${STAGEDIR}${DATADIR}/logs
-	${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/openfire.xml \
-		${STAGEDIR}${ETCDIR}/openfire.xml.sample
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/${PORTNAME}.xml \
+		${STAGEDIR}${ETCDIR}/${PORTNAME}.xml.sample
 	${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/truststore \
 		${STAGEDIR}${ETCDIR}/truststore.sample
 	${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/keystore \
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index 43aa0a85e65c..473cda30e09d 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513075267
-SHA256 (igniterealtime-Openfire-v4.2.1_GH0.tar.gz) = 37557c598c7b46f8d0e83b8a1ff789cbb59156a651eed881b1454a300d2ad345
-SIZE (igniterealtime-Openfire-v4.2.1_GH0.tar.gz) = 108222938
+TIMESTAMP = 1518606031
+SHA256 (openfire_src_4_2_2.tar.gz) = a9fa56332cec9437c751644bf23dbbf65a332605493d4780b97b0da4a5febe7d
+SIZE (openfire_src_4_2_2.tar.gz) = 110865419
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index 107cb5b27da4..2c5e30256325 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -409,6 +409,7 @@
 %%PLUGINS%%%%DATADIR%%/plugins/tikitoken.jar
 %%PLUGINS%%%%DATADIR%%/plugins/userCreation.jar
 %%PLUGINS%%%%DATADIR%%/plugins/userImportExport.jar
+%%PLUGINS%%%%DATADIR%%/plugins/userStatus.jar
 %%PLUGINS%%%%DATADIR%%/plugins/userservice.jar
 %%PLUGINS%%%%DATADIR%%/plugins/xmldebugger.jar
 @dir %%VARDB%%