diff --git a/mail/linux-r7-organizer-pro/Makefile b/mail/linux-r7-organizer-pro/Makefile
index fbc7934423f1..a0ed7767b841 100644
--- a/mail/linux-r7-organizer-pro/Makefile
+++ b/mail/linux-r7-organizer-pro/Makefile
@@ -1,46 +1,45 @@
 PORTNAME=	r7-organizer-pro
-PORTVERSION=	2.6.7
+PORTVERSION=	3.1.6
 DISTVERSIONSUFFIX=	-1
-PORTREVISION=	1
 CATEGORIES=	mail linux russian
 MASTER_SITES=	https://download.r7-office.ru/organizer/centos/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	r7organizer_pro-${PORTVERSION}${DISTVERSIONSUFFIX}
 EXTRACT_SUFX=	.x86_64.rpm
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Russian office mail, tasks and contacts organizer
 WWW=		https://r7-office.ru/organizer
 
 LICENSE=	commercial
 LICENSE_NAME=	commercial
 LICENSE_TEXT=	Commercial software with 30 days trial period
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 ONLY_FOR_ARCHS=	amd64
 
 USES=		desktop-file-utils linux:rl9 shared-mime-info
 
 USE_LINUX=	gtk3 sqlite3 alsalib
 
 CONFLICTS_INSTALL=	linux-r7-organizer
 
 NO_BUILD=	yes
 PLIST_SUB=	LINUXBASE=${LINUXBASE}
 STRIP=
 
 post-patch:
 	${REINPLACE_CMD} -i '' 's|/opt/r7-office/organizer/|${PREFIX}/bin/|' ${WRKDIR}/opt/r7-office/organizer/r7-organizer.desktop
 	${REINPLACE_CMD} -i '' 's|P7|Р7|' ${WRKDIR}/opt/r7-office/organizer/r7-organizer.desktop
 
 do-install:
 	cd ${WRKDIR}/opt && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share
 	${RM} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7organizer*
 	${INSTALL_PROGRAM} -C ${WRKDIR}/opt/r7-office/organizer/r7organizer ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7organizer
 	${INSTALL_PROGRAM} -C ${WRKDIR}/opt/r7-office/organizer/r7organizer-bin ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7organizer-bin
 	${RLN} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7organizer ${STAGEDIR}${PREFIX}/bin/
 	${MV} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7-organizer.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${RLN} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/chrome/icons/default/default256.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/r7-organizer.png
 
 .include <bsd.port.mk>
diff --git a/mail/linux-r7-organizer-pro/distinfo b/mail/linux-r7-organizer-pro/distinfo
index 0a8626619df1..429044140ec5 100644
--- a/mail/linux-r7-organizer-pro/distinfo
+++ b/mail/linux-r7-organizer-pro/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718793189
-SHA256 (r7organizer_pro-2.6.7-1.x86_64.rpm) = af7ec881df0070e05d6b59776a5764ccad98f52d6d2b8e7c5559fc58dc1e9d3b
-SIZE (r7organizer_pro-2.6.7-1.x86_64.rpm) = 85674836
+TIMESTAMP = 1730982273
+SHA256 (r7organizer_pro-3.1.6-1.x86_64.rpm) = a81671fbb2a03c125e632d6bb0e56ee4513f47b327fc5196c83362d621a23926
+SIZE (r7organizer_pro-3.1.6-1.x86_64.rpm) = 91664270
diff --git a/mail/linux-r7-organizer-pro/pkg-plist b/mail/linux-r7-organizer-pro/pkg-plist
index 035b5aaff9ee..9be558870060 100644
--- a/mail/linux-r7-organizer-pro/pkg-plist
+++ b/mail/linux-r7-organizer-pro/pkg-plist
@@ -1,54 +1,64 @@
 bin/r7organizer
 share/applications/r7-organizer.desktop
 share/pixmaps/r7-organizer.png
 share/r7-office/organizer/application.ini
+share/r7-office/organizer/chrome/icons/default/calendar-alarm-dialog.png
+share/r7-office/organizer/chrome/icons/default/calendar-general-dialog.png
 share/r7-office/organizer/chrome/icons/default/default128.png
 share/r7-office/organizer/chrome/icons/default/default16.png
 share/r7-office/organizer/chrome/icons/default/default22.png
 share/r7-office/organizer/chrome/icons/default/default24.png
 share/r7-office/organizer/chrome/icons/default/default256.png
 share/r7-office/organizer/chrome/icons/default/default32.png
 share/r7-office/organizer/chrome/icons/default/default48.png
 share/r7-office/organizer/chrome/icons/default/default64.png
+share/r7-office/organizer/chrome/icons/default/msgcomposeWindow16.png
+share/r7-office/organizer/chrome/icons/default/msgcomposeWindow24.png
+share/r7-office/organizer/chrome/icons/default/msgcomposeWindow32.png
+share/r7-office/organizer/chrome/icons/default/msgcomposeWindow48.png
 share/r7-office/organizer/defaults/messenger/mailViews.dat
 share/r7-office/organizer/defaults/pref/channel-prefs.js
 share/r7-office/organizer/dependentlibs.list
 share/r7-office/organizer/distribution/policies.json
 share/r7-office/organizer/fonts/TwemojiMozilla.ttf
+share/r7-office/organizer/glxtest
 share/r7-office/organizer/isp/Bogofilter.sfd
 share/r7-office/organizer/isp/DSPAM.sfd
 share/r7-office/organizer/isp/POPFile.sfd
 share/r7-office/organizer/isp/SpamAssassin.sfd
 share/r7-office/organizer/isp/SpamPal.sfd
 share/r7-office/organizer/libfreeblpriv3.so
 share/r7-office/organizer/liblgpllibs.so
+share/r7-office/organizer/libmozavcodec.so
+share/r7-office/organizer/libmozavutil.so
 share/r7-office/organizer/libmozgtk.so
 share/r7-office/organizer/libmozsandbox.so
 share/r7-office/organizer/libmozsqlite3.so
 share/r7-office/organizer/libmozwayland.so
 share/r7-office/organizer/libnspr4.so
 share/r7-office/organizer/libnss3.so
 share/r7-office/organizer/libnssckbi.so
 share/r7-office/organizer/libnssutil3.so
 share/r7-office/organizer/libplc4.so
 share/r7-office/organizer/libplds4.so
 share/r7-office/organizer/librnp.so
 share/r7-office/organizer/libsmime3.so
 share/r7-office/organizer/libsoftokn3.so
 share/r7-office/organizer/libssl3.so
 share/r7-office/organizer/libxul.so
 share/r7-office/organizer/locale.ini
 share/r7-office/organizer/omni.ja
 share/r7-office/organizer/pingsender
 share/r7-office/organizer/platform.ini
 share/r7-office/organizer/plugin-container
 share/r7-office/organizer/precomplete
 share/r7-office/organizer/r7exchange.xpi
 share/r7-office/organizer/r7filelink.xpi
-share/r7-office/organizer/r7importtools.xpi
 share/r7-office/organizer/r7organizer
 share/r7-office/organizer/r7organizer-bin
+share/r7-office/organizer/r7pstimport.xpi
 share/r7-office/organizer/readpst/readpst
 share/r7-office/organizer/removed-files
 share/r7-office/organizer/rnp-cli
 share/r7-office/organizer/rnpkeys
+share/r7-office/organizer/vaapitest