diff --git a/metadata/md5-cache/net-misc/nomachine-8.2.3.4 b/metadata/md5-cache/net-misc/nomachine-8.2.3.4
index bee8e0e..783ed34 100644
--- a/metadata/md5-cache/net-misc/nomachine-8.2.3.4
+++ b/metadata/md5-cache/net-misc/nomachine-8.2.3.4
@@ -8,6 +8,6 @@ LICENSE=nomachine
 RDEPEND=dev-libs/glib:2 sys-libs/libudev-compat virtual/libcrypt:0 dev-libs/openssl:0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://download.nomachine.com/download/8.2/Linux/nomachine_8.2.3_4_x86_64.tar.gz
-_eclasses_=wrapper	4a1902f969e5718126434fc35f3a0d9c	desktop	7eb20ad915a0a318176d51bc2508ff5c
-_md5_=b800aa8d50bf5240a549fe0cdc7dd771
+SRC_URI=amd64? ( https://download.nomachine.com/download/8.2/Linux/nomachine_8.2.3_4_x86_64.tar.gz ) arm64? ( https://download.nomachine.com/download/8.2/Arm/nomachine_8.2.3_4_aarch64.tar.gz )
+_eclasses_=wrapper	4a1902f969e5718126434fc35f3a0d9c	desktop	021728fdc1b03b36357dbc89489e0f0d
+_md5_=b70a76c0ba3c4da320d5871416042357
diff --git a/metadata/md5-cache/net-misc/nomachine-8.4.2.1 b/metadata/md5-cache/net-misc/nomachine-8.4.2.1
new file mode 100644
index 0000000..2eb4257
--- /dev/null
+++ b/metadata/md5-cache/net-misc/nomachine-8.4.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DESCRIPTION=NoMachine all-in-one package
+EAPI=7
+HOMEPAGE=https://www.nomachine.com
+INHERIT=wrapper desktop
+KEYWORDS=~amd64
+LICENSE=nomachine
+RDEPEND=dev-libs/glib:2 sys-libs/libudev-compat virtual/libcrypt:0 dev-libs/openssl:0
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( https://download.nomachine.com/download/8.4/Linux/nomachine_8.4.2_1_x86_64.tar.gz ) arm64? ( https://download.nomachine.com/download/8.4/Arm/nomachine_8.4.2_1_aarch64.tar.gz )
+_eclasses_=wrapper	4a1902f969e5718126434fc35f3a0d9c	desktop	021728fdc1b03b36357dbc89489e0f0d
+_md5_=b70a76c0ba3c4da320d5871416042357
diff --git a/net-misc/nomachine/Manifest b/net-misc/nomachine/Manifest
index ccedcf3..90eac85 100644
--- a/net-misc/nomachine/Manifest
+++ b/net-misc/nomachine/Manifest
@@ -1,2 +1,6 @@
+DIST nomachine_8.2.3_4_aarch64.tar.gz 150086 BLAKE2B 445855097ef87511f634c776f777a98fb237a419c09505908e9ca571a775518a5314845db163e0574e54205d85c57f47a408f66b9b836ed24cfca603916c2daf SHA512 a30caa7865a4540125d17743f957eafb7a15f88f74aad1e11bbffecfc8648e62a3200701c3b9bd892dde8cc5d784bb9eb976e0b153b34883780b61812e796833
 DIST nomachine_8.2.3_4_x86_64.tar.gz 55689033 BLAKE2B a88dd99f12a6cd7b0e0c076c54ecde4f181922c1cefdc09abe849b8fec7a32130dc0c238b66e52067751310ce1ee3a942cd9eca2b19862724ae55d0698283605 SHA512 a0281e428224f40a0cd4746c1c8a05cbb3972a9cad03bfb476c65a78324ca2e7a7151cb47726899c40f29abe9190169d259d96e7880bc5bc0a7de5e9fc7d3b63
-EBUILD nomachine-8.2.3.4.ebuild 1413 BLAKE2B 20014a29dd3d10ef79a963f5b060af65e491cdd222ec9895abda70b9bd376412f5fddcc3a2f835fbc617418b663c0a0b7bbd0fa5ffec87c32e519454e0a4e74b SHA512 5077f0399f4f3b602648a2277fcfa021194520ccb68826f8e70f27898033e89743c374127ca44bc28a0982e10c252e4a9af09e8a0e30d8db05208eed4df08b1b
+DIST nomachine_8.4.2_1_aarch64.tar.gz 50420579 BLAKE2B 56f5bab955d87e4a008e2cbff80823aa917e4ed651c7da90bb4b9733ebfe9a11e1105d5f23bd4bc8690a40177c92d87a5c3351bb68ef865dbca983452c5920db SHA512 fcf72092881cc38b10143affd1741c3462e9bc610c8ad642ef13e1192394102e2b51afda6c94d4a6727ea02808b0daeb1f4b3da1825bad5940c1c35ca6ac64c6
+DIST nomachine_8.4.2_1_x86_64.tar.gz 55736485 BLAKE2B f13318e4575ae3ebaa3aaf2e20d071528a18a32ceda6f127f4b4c21b6ef49736e187f551d5ec8fe32db9d1b29b4ed9f2d05ce35a30b0d26a8db3511219f8cc3d SHA512 8ed41b58ae8fffd7d9795affc59c242fe711cc3537f1178f152488b764229e2239eb24a0039ef27be27b7c08ec11389288001f554be3569e9b4f3cf981fa23eb
+EBUILD nomachine-8.2.3.4.ebuild 1517 BLAKE2B 233d80ba270df71b9403d722df0ce4043184b8f11b10f1ce0ff0fe04ab4876b53b2856dddc95874b1e8e5568e5fe43b4c4b7f385b9c8b598717fd987886092c1 SHA512 7c6365ba50c41f8e931bdd5cc851a594711aea348f6a84d66899d65a861024206b32a6e7ac2d4190e7c7d1221e28f3eed632777570dd216fc25d5b989e68e610
+EBUILD nomachine-8.4.2.1.ebuild 1517 BLAKE2B 233d80ba270df71b9403d722df0ce4043184b8f11b10f1ce0ff0fe04ab4876b53b2856dddc95874b1e8e5568e5fe43b4c4b7f385b9c8b598717fd987886092c1 SHA512 7c6365ba50c41f8e931bdd5cc851a594711aea348f6a84d66899d65a861024206b32a6e7ac2d4190e7c7d1221e28f3eed632777570dd216fc25d5b989e68e610
diff --git a/net-misc/nomachine/nomachine-8.2.3.4.ebuild b/net-misc/nomachine/nomachine-8.2.3.4.ebuild
index 057403e..3d9f43d 100644
--- a/net-misc/nomachine/nomachine-8.2.3.4.ebuild
+++ b/net-misc/nomachine/nomachine-8.2.3.4.ebuild
@@ -10,7 +10,8 @@ MY_PV=$(ver_rs 3 '_')
 
 DESCRIPTION="NoMachine all-in-one package"
 HOMEPAGE="https://www.nomachine.com"
-SRC_URI="https://download.nomachine.com/download/${MY_V}/Linux/${PN}_${MY_PV}_x86_64.tar.gz"
+SRC_URI="amd64? ( https://download.nomachine.com/download/${MY_V}/Linux/${PN}_${MY_PV}_x86_64.tar.gz )
+arm64? ( https://download.nomachine.com/download/${MY_V}/Arm/${PN}_${MY_PV}_aarch64.tar.gz )"
 S="${WORKDIR}/NX/etc/NX/server/packages"
 
 LICENSE="nomachine"
diff --git a/net-misc/nomachine/nomachine-8.4.2.1.ebuild b/net-misc/nomachine/nomachine-8.4.2.1.ebuild
new file mode 100644
index 0000000..3d9f43d
--- /dev/null
+++ b/net-misc/nomachine/nomachine-8.4.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit wrapper desktop
+
+MY_V=$(ver_cut 1-2)
+MY_PV=$(ver_rs 3 '_')
+
+DESCRIPTION="NoMachine all-in-one package"
+HOMEPAGE="https://www.nomachine.com"
+SRC_URI="amd64? ( https://download.nomachine.com/download/${MY_V}/Linux/${PN}_${MY_PV}_x86_64.tar.gz )
+arm64? ( https://download.nomachine.com/download/${MY_V}/Arm/${PN}_${MY_PV}_aarch64.tar.gz )"
+S="${WORKDIR}/NX/etc/NX/server/packages"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="strip"
+
+DEPEND=""
+BDEPEND=""
+RDEPEND="dev-libs/glib:2
+		sys-libs/libudev-compat
+		virtual/libcrypt:0
+		dev-libs/openssl:0"
+
+QA_PREBUILT="*"
+
+src_install() {
+	local NXROOT=/opt/NX
+
+	###doicon "${FILESDIR}/${PN}.png"
+	make_desktop_entry "nxserver" "NoMachine Server" "" "Network"
+	make_desktop_entry "nxnode" "NoMachine nxnode" "" "Network"
+	make_desktop_entry "nxrunner" "NoMachine nxrunner" "" "Network"
+	make_desktop_entry "nxplayer" "NoMachine Client" "" "Network"
+	dodir /opt
+	tar xzof nxserver.tar.gz -C "${D}"/opt
+	tar xzof nxnode.tar.gz -C "${D}"/opt
+	tar xzof nxrunner.tar.gz -C "${D}"/opt
+	tar xzof nxplayer.tar.gz -C "${D}"/opt
+
+	make_wrapper nxserver ${NXROOT}/bin/nxserver ${NXROOT} ${NXROOT}/lib /opt/bin
+	make_wrapper nxnode ${NXROOT}/bin/nxnode ${NXROOT} ${NXROOT}/lib /opt/bin
+	make_wrapper nxrunner ${NXROOT}/bin/nxrunner ${NXROOT} ${NXROOT}/lib /opt/bin
+	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
+}