diff --git a/net-p2p/monero-cli/Makefile b/net-p2p/monero-cli/Makefile
index 2f6cca51bf30..f6ac397d2d91 100644
--- a/net-p2p/monero-cli/Makefile
+++ b/net-p2p/monero-cli/Makefile
@@ -1,114 +1,111 @@
 PORTNAME=	monero-cli
-# To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present)
-PORTVERSION=	0.18.1.2
-PORTREVISION=	4
+# To build from an arbitrary git commit comment DISTVERSION and PORTREVISION (if present)
+DISTVERSION=	0.18.2.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 # and uncomment the following two lines (use for example -git-HEAD or -git-b6420e1)
 #PORTVERSION=	0
 #PKGNAMESUFFIX=	-git-HEAD
 CATEGORIES=	net-p2p finance
 
-PATCH_SITES+=	https://github.com/monero-project/monero/commit/
-PATCHFILES+=	ac87d8dac95bb7777898479ded1de3e53422a3e9.patch:-p1
-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Private, secure, untraceable, decentralised digital currency (CLI)
 WWW=		https://getmonero.org/
 
 LICENSE=	BSD3CLAUSE
 
 BROKEN_SSL=	libressl
 BROKEN_i386=	fails to compile: register r15d is only available in 64-bit mode
 BROKEN_aarch64=	fails to compile: uses unavailable HWCAP_AES and getauxval
 
 LIB_DEPENDS=	\
 		libboost_chrono.so:devel/boost-libs \
 		libboost_date_time.so:devel/boost-libs \
 		libboost_filesystem.so:devel/boost-libs \
 		libboost_program_options.so:devel/boost-libs \
 		libboost_regex.so:devel/boost-libs \
 		libboost_serialization.so:devel/boost-libs \
 		libboost_system.so:devel/boost-libs \
 		libboost_thread.so:devel/boost-libs \
 		libminiupnpc.so:net/miniupnpc \
 		libnorm.so:net/norm \
 		libpgm.so:net/openpgm \
 		libsodium.so:security/libsodium \
 		libunbound.so:dns/unbound \
 		libzmq.so:net/libzmq4
 BUILD_DEPENDS=	${LOCALBASE}/include/rapidjson/document.h:devel/rapidjson \
 		${LOCALBASE}/include/zmq.hpp:net/cppzmq
 
 USES=		cmake compiler:c++11-lib pkgconfig readline ssl
 USE_GITHUB=	yes
 .if defined(PKGNAMESUFFIX)
 GIT_COMMIT=	${PKGNAMESUFFIX:C/-git-//}
 .else
 GIT_COMMIT=	${DISTVERSIONPREFIX}${PORTVERSION}
 .endif
 GH_TUPLE=	monero-project:monero:${GIT_COMMIT} \
 		monero-project:supercop:633500ad8c875999:ext1/external/supercop \
 		tevador:RandomX:85c527a62301b7b8be89d941:ext2/external/randomx \
 		trezor:trezor-common:bff7fdfe436c727982c:ext3/external/trezor-common
 
 CFLAGS+=	-D_WANT_SEMUN
 
 OPTIONS_DEFINE=		DOXYGEN
 DOXYGEN_BUILD_DEPENDS=	dot:graphics/graphviz \
 			doxygen:devel/doxygen
 DOXYGEN_CMAKE_BOOL=	BUILD_DOCUMENTATION
 
 .include <bsd.port.pre.mk>
 
 # On FreeBSD 12.x the default ld(1) is LLVM's ld which needs an explicit -m option
 # when linking without any input .o on the command line, like:
 # /usr/bin/ld -melf_amd64 -r -b binary -o blocksdat.o blocks.dat
 # See Bug 226996 - net-p2p/monero-cli: fails to link with lld as the system linker
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=226996
 .if ${ARCH} == aarch64
 LD_EMULATION=	aarch64elf
 .elif ${ARCH} == amd64
 LD_EMULATION=	elf_amd64
 .elif ${ARCH} == i386
 LD_EMULATION=	elf_i386_fbsd
 .elif ${ARCH} == powerpc
 LD_EMULATION=	elf32ppc
 .elif ${ARCH} == powerpc64
 LD_EMULATION=	elf64ppc
 .elif ${ARCH} == powerpc64le
 LD_EMULATION=	elf64lppc
 .endif
 
 CMAKE_ARGS+=	-DLD_RAW_FLAGS:STRING=-m${LD_EMULATION}
 
 # keep in sync with all platforms where libunwind is available
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .else
 CMAKE_ARGS+=	-DSTACK_TRACE:BOOL=OFF
 .endif
 
 CMAKE_ARGS+=	-DMANUAL_SUBMODULES:BOOL=ON
 
 USE_RC_SUBR=	monerod
 
 USERS=		monero
 GROUPS=		monero
 
 PLIST_FILES=	\
 		bin/monero-blockchain-ancestry \
 		bin/monero-blockchain-depth \
 		bin/monero-blockchain-export \
 		bin/monero-blockchain-import \
 		bin/monero-blockchain-mark-spent-outputs \
 		bin/monero-blockchain-prune \
 		bin/monero-blockchain-prune-known-spent-data \
 		bin/monero-blockchain-stats \
 		bin/monero-blockchain-usage \
 		bin/monero-gen-ssl-cert \
 		bin/monero-gen-trusted-multisig \
 		bin/monero-wallet-cli \
 		bin/monero-wallet-rpc \
 		bin/monerod
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/monero-cli/distinfo b/net-p2p/monero-cli/distinfo
index 84eca18895ef..e9d09a2169fe 100644
--- a/net-p2p/monero-cli/distinfo
+++ b/net-p2p/monero-cli/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1673552302
-SHA256 (monero-project-monero-v0.18.1.2_GH0.tar.gz) = f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
-SIZE (monero-project-monero-v0.18.1.2_GH0.tar.gz) = 11609034
+TIMESTAMP = 1684869892
+SHA256 (monero-project-monero-v0.18.2.2_GH0.tar.gz) = 3877c664d43046811407b92208a9f5c90f62f4b8077014854ebff56909a48b5e
+SIZE (monero-project-monero-v0.18.2.2_GH0.tar.gz) = 11640001
 SHA256 (monero-project-supercop-633500ad8c875999_GH0.tar.gz) = 19861f74bfc2cc0b61a49bf0ff2da5c793432d31e8677b23455a4229dcb6435b
 SIZE (monero-project-supercop-633500ad8c875999_GH0.tar.gz) = 346190
 SHA256 (tevador-RandomX-85c527a62301b7b8be89d941_GH0.tar.gz) = f21ada9d84387061f9d93d2fb4314c4eb136ee916d6fd168c0fcba24fb6bfbbb
 SIZE (tevador-RandomX-85c527a62301b7b8be89d941_GH0.tar.gz) = 164353
 SHA256 (trezor-trezor-common-bff7fdfe436c727982c_GH0.tar.gz) = 298338e9924437677be76546929c64cda2bd8b04dbd2c3b533cdcf1291f903a0
 SIZE (trezor-trezor-common-bff7fdfe436c727982c_GH0.tar.gz) = 1327776
-SHA256 (ac87d8dac95bb7777898479ded1de3e53422a3e9.patch) = 016a43f8dfddbf713e45b48133d76f5539b0345782ffd150d07c6ac3b18b8747
-SIZE (ac87d8dac95bb7777898479ded1de3e53422a3e9.patch) = 1053