diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index ab5e10bcf8c5..7222e28417e4 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -1,13 +1,12 @@
 # Created by: Nikolay Pavlov <qpadla@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	openfire
-PORTVERSION=	4.6.3
+PORTVERSION=	4.6.4
 PORTEPOCH=	1
 CATEGORIES=	net-im java
-MASTER_SITES=	https://github.com/igniterealtime/${PORTNAME}/releases/download/v${PORTVERSION}/ \
+MASTER_SITES=	https://github.com/igniterealtime/${PORTNAME}/archive/refs/tags/ \
 		LOCAL/pi:maven
-DISTFILES=	${PORTNAME}_src_${PORTVERSION:S/./_/g}.tar.gz
+DISTFILES=	v${PORTVERSION}.tar.gz
 
 MAINTAINER=	nikita@druba.su
 COMMENT=	Enterprise instant messaging server
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index d75646c4e638..a16b59c4bc45 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1624191431
-SHA256 (openfire_src_4_6_3.tar.gz) = c5c30e781b242d5a03b857f4605ed74ea643fec9221a45368ecd417830a6d674
-SIZE (openfire_src_4_6_3.tar.gz) = 6760615
-SHA256 (FreeBSD-openfire-4.6.3-maven-repository.tar.gz) = 6f451af052b1b1bf1177910db29a84d18808245e773d3e959896fd14853af3f3
-SIZE (FreeBSD-openfire-4.6.3-maven-repository.tar.gz) = 252920205
+TIMESTAMP = 1624266366
+SHA256 (v4.6.4.tar.gz) = 7472674c2469b7fb1eb25edcb4b529eda0a49be335c146861656d766443bda23
+SIZE (v4.6.4.tar.gz) = 6770705
+SHA256 (FreeBSD-openfire-4.6.4-maven-repository.tar.gz) = 82a196764301a71f70f1a23bab4628772c9bfc05088a3a0328ef47df0b8ae453
+SIZE (FreeBSD-openfire-4.6.4-maven-repository.tar.gz) = 253011622
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index df7131988b51..36ccaefc34b4 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -71,7 +71,7 @@
 %%DATADIR%%/lib/commons-codec-1.12.jar
 %%DATADIR%%/lib/commons-dbcp2-2.6.0.jar
 %%DATADIR%%/lib/commons-fileupload-1.4.jar
-%%DATADIR%%/lib/commons-io-2.6.jar
+%%DATADIR%%/lib/commons-io-2.7.jar
 %%DATADIR%%/lib/commons-lang3-3.9.jar
 %%DATADIR%%/lib/commons-logging-1.2.jar
 %%DATADIR%%/lib/commons-pool2-2.6.2.jar
@@ -85,7 +85,7 @@
 %%DATADIR%%/lib/hsqldb-2.4.1.jar
 %%DATADIR%%/lib/httpclient-4.5.13.jar
 %%DATADIR%%/lib/httpcore-4.4.13.jar
-%%DATADIR%%/lib/i18n-4.6.3.jar
+%%DATADIR%%/lib/i18n-4.6.4.jar
 %%DATADIR%%/lib/imageio-bmp-3.5.jar
 %%DATADIR%%/lib/imageio-core-3.5.jar
 %%DATADIR%%/lib/istack-commons-runtime-3.0.8.jar
@@ -157,7 +157,7 @@
 %%DATADIR%%/lib/websocket-common-9.4.35.v20201120.jar
 %%DATADIR%%/lib/websocket-server-9.4.35.v20201120.jar
 %%DATADIR%%/lib/websocket-servlet-9.4.35.v20201120.jar
-%%DATADIR%%/lib/xmppserver-4.6.3.jar
+%%DATADIR%%/lib/xmppserver-4.6.4.jar
 %%DATADIR%%/lib/xpp3-1.1.4c.jar
 %%DATADIR%%/logs
 %%DATADIR%%/plugins/admin/plugin.xml