diff --git a/news/rntrack/Makefile b/news/rntrack/Makefile
index 90678d46536b..6468d286f72d 100644
--- a/news/rntrack/Makefile
+++ b/news/rntrack/Makefile
@@ -1,59 +1,61 @@
 PORTNAME=	rntrack
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	news mail
 
 MAINTAINER=	admin@5034.ru
 COMMENT=	FTN Messages tracker
 WWW=		https://github.com/vasilyevmax/rntrack/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++14-lang
 USE_CXXSTD=	c++14
 USE_GITHUB=	yes
 GH_ACCOUNT=	vasilyevmax
 
+CXXFLAGS+=	-D__REGISTER_PREFIX__=
 MAKE_ENV=	CONFIG=${ETCDIR}/${PORTNAME}.cfg
 
 ETCDIR=		${PREFIX}/etc/fido/${PORTNAME}
 
 BUILD_WRKSRC=	${WRKSRC}/MakeFiles/FreeBSD
 
 OPTIONS_DEFINE=	DOCS EXAMPLES LOG_PID SCRIPTS SYSLOG_FORMAT
 
 LOG_PID_DESC=		Enable PID logging
 SCRIPTS_DESC=		Enable Perl scripts support
 SYSLOG_FORMAT_DESC=	Use syslog-like log style
 
 LOG_PID_MAKE_ARGS=		ENABLE_LOG_PID=1
 SCRIPTS_USES=			perl5
 SCRIPTS_MAKE_ARGS=		ENABLE_SCRIPTS=1
 SYSLOG_FORMAT_MAKE_ARGS=	ENABLE_SYSLOG_LOG_FORMAT=1
 
 _DOCS=		FAQ_en FAQ_ru report.err report.err.ru
 _EXAMPLES=	bignode.zip bignode2.zip node1042.zip node1157.zip \
 		node.cfg node2.cfg node3.cfg perl-test.cfg \
 		point.cfg point2.cfg traflog.tpl
 _TBL=		alt2koi.tbl koi2alt.tbl
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
 	${MKDIR} ${STAGEDIR}${ETCDIR}/tbl \
 		 ${STAGEDIR}${ETCDIR}/tpl
 	${INSTALL_DATA} ${WRKSRC}/samples/node.cfg ${STAGEDIR}${ETCDIR}/${PORTNAME}.cfg.sample
 	${INSTALL_DATA} ${WRKSRC}/samples/test.pl ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/tpl/* ${STAGEDIR}${ETCDIR}/tpl
 	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_DATA} ${_TBL:S|^|${WRKSRC}/samples/|} ${STAGEDIR}${ETCDIR}/tbl
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${_EXAMPLES:S|^|${WRKSRC}/samples/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/news/rntrack/files/patch-MakeFiles_FreeBSD_Makefile b/news/rntrack/files/patch-MakeFiles_FreeBSD_Makefile
new file mode 100644
index 000000000000..d7f9a46e1d8e
--- /dev/null
+++ b/news/rntrack/files/patch-MakeFiles_FreeBSD_Makefile
@@ -0,0 +1,31 @@
+--- MakeFiles/FreeBSD/Makefile.orig	2023-02-11 19:53:26 UTC
++++ MakeFiles/FreeBSD/Makefile
+@@ -1,7 +1,8 @@
+ # $Id$
+-CC	= c++
++CC	?= c++
+ SMAPIDIR= ../../smapi
+-CFLAGS	= -Wall -W -fno-rtti -I../../hpp -I../../src -I$(SMAPIDIR)/h -I$(SMAPIDIR)/src -O3
++CFLAGS	+= -Wall -W -fno-rtti -I../../hpp -I../../src -I$(SMAPIDIR)/h -I$(SMAPIDIR)/src
++CXXFLAGS+= -Wall -W -fno-rtti -I../../hpp -I../../src -I$(SMAPIDIR)/h -I$(SMAPIDIR)/src
+ CDEFS	= -DUNIX -DHAVE_STDIO_H -DHAVE_STDLIB_H -DHAVE_STRING_H -DHAVE_CTYPE_H -DHAVE_SYS_TYPES_H \
+           -DHAVE_SYS_STAT_H -DHAVE_UNISTD_H -DHAVE_FCNTL_H -DHAVE_ERRNO_H -DHAVE_IOSTREAM_H \
+           -DHAVE_TIME_H -DHAVE_STDARG_H -DHAVE_ASSERT_H -DHAVE_DIRECT_H -DHAVE_DIRENT_H \
+@@ -75,7 +76,7 @@ OBJS= \
+ .PATH.c: $(SRCDIR)
+ 
+ .cpp.o:
+-	${CC} ${CFLAGS} ${CDEFS} -c $<
++	${CC} ${CXXFLAGS} ${CDEFS} -c $<
+ 
+ .c.o:
+ 	${CC} ${CFLAGS} ${CDEFS} -c $<
+@@ -88,7 +89,7 @@ rntrack: smapi ${OBJS}
+ 	$(MAKE) -C $(SMAPIDIR) -f makefile.bsd
+ 
+ rntrack: smapi ${OBJS}
+-	${CC} -o rntrack ${OBJS} ${LFLAGS}
++	${CXX} -o rntrack ${OBJS} ${LFLAGS}
+ 
+ clean:
+ 	-rm -f $(SMAPIDIR)/*.o
diff --git a/news/rntrack/files/patch-smapi_src_api__sdm.c b/news/rntrack/files/patch-smapi_src_api__sdm.c
new file mode 100644
index 000000000000..2b67ad1f0843
--- /dev/null
+++ b/news/rntrack/files/patch-smapi_src_api__sdm.c
@@ -0,0 +1,25 @@
+src//api_sdm.c:1183:41: warning: shift count >= width of type [-Wshift-count-overflow]
+ 1183 |             if(mh->num_msg == (dword)(1 << (sizeof(mh->num_msg) * 8 - 1)))
+      |                                         ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+2 warnings generated.
+
+--- smapi/src/api_sdm.c.orig	2023-02-11 19:53:26 UTC
++++ smapi/src/api_sdm.c
+@@ -430,7 +430,7 @@ static MSGH * _XPENTRY SdmOpenMsg(MSGA * mh, word mode
+ 
+     if(mode == MOPEN_CREATE)
+     {
+-        if(mh->num_msg == (dword)(1 << (sizeof(mh->num_msg) * 8 - 1)))
++        if(mh->num_msg == ((dword)1 << (sizeof(mh->num_msg) * 8 - 1)))
+         {
+             /* Messagebase implementaion (size) limit (messages counter is full)*/
+             pfree(msgh);
+@@ -1180,7 +1180,7 @@ static sword near _SdmRescanArea(MSGA * mh)
+ 
+ #endif
+ 
+-            if(mh->num_msg == (dword)(1 << (sizeof(mh->num_msg) * 8 - 1)))
++            if(mh->num_msg == ((dword)1 << (sizeof(mh->num_msg) * 8 - 1)))
+             {
+                 /* Messagebase implementaion (size) limit (messages counter is full)*/
+                 msgapierr = MERR_LIMIT;