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 4c912a6..bee8e0e 100644
--- a/metadata/md5-cache/net-misc/nomachine-8.2.3.4
+++ b/metadata/md5-cache/net-misc/nomachine-8.2.3.4
@@ -1,13 +1,13 @@
-DEFINED_PHASES=-
-DESCRIPTION=NoMachine meta package
+DEFINED_PHASES=install
+DESCRIPTION=NoMachine all-in-one package
 EAPI=7
 HOMEPAGE=https://www.nomachine.com
 INHERIT=wrapper desktop
 KEYWORDS=~amd64
 LICENSE=nomachine
-RDEPEND=net-misc/nxserver net-misc/nxnode net-misc/nxrunner net-misc/nxplayer dev-libs/glib:2 sys-libs/libudev-compat virtual/libcrypt:0 dev-libs/openssl:0
+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_=cef5e447011c8ae7f01afa084cd61a6a
+_md5_=b800aa8d50bf5240a549fe0cdc7dd771
diff --git a/net-misc/nomachine/Manifest b/net-misc/nomachine/Manifest
index 053b4f5..ccedcf3 100644
--- a/net-misc/nomachine/Manifest
+++ b/net-misc/nomachine/Manifest
@@ -1,2 +1,2 @@
 DIST nomachine_8.2.3_4_x86_64.tar.gz 55689033 BLAKE2B a88dd99f12a6cd7b0e0c076c54ecde4f181922c1cefdc09abe849b8fec7a32130dc0c238b66e52067751310ce1ee3a942cd9eca2b19862724ae55d0698283605 SHA512 a0281e428224f40a0cd4746c1c8a05cbb3972a9cad03bfb476c65a78324ca2e7a7151cb47726899c40f29abe9190169d259d96e7880bc5bc0a7de5e9fc7d3b63
-EBUILD nomachine-8.2.3.4.ebuild 673 BLAKE2B 30aa87018f04d59839e504201aec9ada45543d55eaaec9c5e11ab5b091ed48f0682bc392c9a3c845a1f3322ef9bb5d8ba233294a921a3a22ada49bedd4043a77 SHA512 bb1f18362c194f1b0621fc89c9b655457fc2acacc6ea9c3d4cf1edfba716ac1cc82d28f5dc92149b326d7f2646ab383587e5380da618e240e4a4caf1d1467aab
+EBUILD nomachine-8.2.3.4.ebuild 1413 BLAKE2B 20014a29dd3d10ef79a963f5b060af65e491cdd222ec9895abda70b9bd376412f5fddcc3a2f835fbc617418b663c0a0b7bbd0fa5ffec87c32e519454e0a4e74b SHA512 5077f0399f4f3b602648a2277fcfa021194520ccb68826f8e70f27898033e89743c374127ca44bc28a0982e10c252e4a9af09e8a0e30d8db05208eed4df08b1b
diff --git a/net-misc/nomachine/nomachine-8.2.3.4.ebuild b/net-misc/nomachine/nomachine-8.2.3.4.ebuild
index 1bd597f..057403e 100644
--- a/net-misc/nomachine/nomachine-8.2.3.4.ebuild
+++ b/net-misc/nomachine/nomachine-8.2.3.4.ebuild
@@ -8,7 +8,7 @@ inherit wrapper desktop
 MY_V=$(ver_cut 1-2)
 MY_PV=$(ver_rs 3 '_')
 
-DESCRIPTION="NoMachine meta package"
+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"
 S="${WORKDIR}/NX/etc/NX/server/packages"
@@ -21,13 +21,29 @@ RESTRICT="strip"
 
 DEPEND=""
 BDEPEND=""
-RDEPEND="net-misc/nxserver
-		net-misc/nxnode
-		net-misc/nxrunner
-		net-misc/nxplayer
-		dev-libs/glib:2
+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
+}