diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 0ccfbb1e557..855766cace7 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,16 +1,23 @@
 { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, python
-, libX11, libXpm, libXft, libXext, zlib, lzma }:
+, libX11, libXpm, libXft, libXext, zlib, lzma, gsl }:
 
 stdenv.mkDerivation rec {
   name = "root-${version}";
-  version = "6.04.16";
+  version = "6.04.18";
 
   src = fetchurl {
     url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    sha256 = "0f58dg83aqhggkxmimsfkd1qyni2vhmykq4qa89cz6jr9p73i1vm";
+    sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9";
   };
 
-  buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib lzma ];
+  buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib lzma gsl ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/root-mirror/root/commit/ee9964210c56e7c1868618a4434c5340fef38fe4.patch";
+      sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r";
+    })
+  ];
 
   preConfigure = ''
     patchShebangs build/unix/
@@ -23,6 +30,8 @@ stdenv.mkDerivation rec {
   ]
   ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include";
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = "https://root.cern.ch/";
     description = "A data analysis framework";