diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix
index 9bc760bf1126..11976e291736 100644
--- a/pkgs/development/tools/geckodriver/default.nix
+++ b/pkgs/development/tools/geckodriver/default.nix
@@ -1,24 +1,26 @@
 { lib
 , fetchFromGitHub
 , rustPlatform
+, stdenv
+, darwin
 }:
 
 with rustPlatform; 
 
 buildRustPackage rec {
-  version = "unstable-2018-02-24";
+  version = "0.22.0";
   name = "geckodriver-${version}";
 
   src = fetchFromGitHub {
     owner = "mozilla";
-    repo = "gecko-dev";
-    rev = "ecb86060b4c5a9808798b81a57e79e821bb47082";
-    sha256 = "1am84a60adw0bb12rlhdqbiwyywhza4qp5sf4f4fmssjl2qcr6nl";
+    repo = "geckodriver";
+    rev = "v${version}";
+    sha256 = "12m95lfqwdxs2m5kjh3yrpm9w2li5m8n3fw46a2nkxyfw6c94l4b";
   };
 
-  sourceRoot = "${src.name}/testing/geckodriver";
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  cargoSha256 = "0dvcvdb623jla29i93glx20nf8pbpfw6jj548ii6brzkcpafxxm8";
+  cargoSha256 = "1a8idl6falz0n9irh1p8hv5w2pmiknzsfnxl70k1psnznrpk2y8n";
 
   meta = with lib; {
     description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers";