diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix
index d0ed40c7d059..754c8c506f66 100644
--- a/pkgs/tools/admin/nomachine-client/default.nix
+++ b/pkgs/tools/admin/nomachine-client/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, file, fetchurl, makeWrapper,
   autoPatchelfHook, jsoncpp, libpulseaudio }:
 let
-  versionMajor = "7.10";
-  versionMinor = "1";
+  versionMajor = "8.4";
+  versionMinor = "2";
   versionBuild_x86_64 = "1";
   versionBuild_i686 = "1";
 in
@@ -14,22 +14,22 @@ in
       if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
           url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
-          sha256 = "sha256-alClFaNbQ76r8LukbygesWWXA5rx6VEzxK+bY5tOfO0=";
+          sha256 = "sha256-r4yRmnMd6uNay7CqmyqYj9F6huoqD8eBby+oDNk1T34=";
         }
       else if stdenv.hostPlatform.system == "i686-linux" then
         fetchurl {
           url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
-          sha256 = "sha256-UDvrjb/2rXvSvpiA+UwiVi4YyXhFLNiEtrszqjAPGXc=";
+          sha256 = "sha256-TvEU1hDvPXQbF7fMI89I2bhap1Y0oetUoFl3yR5eTGg=";
         }
       else
         throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
 
     # nxusb-legacy is only needed for kernel versions < 3
     postUnpack = ''
-      mv $(find . -type f -name nxclient.tar.gz) .
+      mv $(find . -type f -name nxrunner.tar.gz) .
       mv $(find . -type f -name nxplayer.tar.gz) .
       rm -r NX/
-      tar xf nxclient.tar.gz
+      tar xf nxrunner.tar.gz
       tar xf nxplayer.tar.gz
       rm $(find . -maxdepth 1 -type f)
       rm -r NX/share/src/nxusb-legacy
@@ -40,7 +40,7 @@ in
     buildInputs = [ jsoncpp libpulseaudio ];
 
     installPhase = ''
-      rm bin/nxplayer bin/nxclient
+      rm bin/nxplayer bin/nxrunner
 
       mkdir -p $out/NX
       cp -r bin lib share $out/NX/
@@ -68,7 +68,7 @@ in
 
     postFixup = ''
       makeWrapper $out/bin/nxplayer.bin $out/bin/nxplayer --set NX_SYSTEM $out/NX
-      makeWrapper $out/bin/nxclient.bin $out/bin/nxclient --set NX_SYSTEM $out/NX
+      makeWrapper $out/bin/nxrunner.bin $out/bin/nxrunner --set NX_SYSTEM $out/NX
 
       # libnxcau.so needs libpulse.so.0 for audio to work, but doesn't
       # have a DT_NEEDED entry for it.