diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/4.3.4.nix
similarity index 88%
rename from pkgs/shells/zsh/default.nix
rename to pkgs/shells/zsh/4.3.4.nix
index 0b227b031b8..ea9a82cf683 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/4.3.4.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, coreutils, ncurses}:
+args: with args;
 stdenv.mkDerivation {
   name = "zsh-4.3.4";
 
diff --git a/pkgs/shells/zsh/4.3.5.nix b/pkgs/shells/zsh/4.3.5.nix
new file mode 100644
index 00000000000..227da7995fb
--- /dev/null
+++ b/pkgs/shells/zsh/4.3.5.nix
@@ -0,0 +1,22 @@
+args: with args;
+let documentation = fetchurl {
+    url = http://www.math.technion.ac.il/pub/zsh/zsh-4.3.5-doc.tar.bz2;
+    sha256 = "0jf35xibp8wfka7rdk9q8spkwprlhjx1sp7vp6img8wks12cvlkx";
+  };
+in
+stdenv.mkDerivation {
+  name = "zsh-${version}";
+
+  src = fetchurl {
+    url = http://www.math.technion.ac.il/pub/zsh/zsh-4.3.5.tar.bz2;
+    sha256 = "0191j3liflkjrj39i2yrs3ab9jcx4zd93rirx3j17dymfgqlvrzb";
+  };
+  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
+
+  postInstall = ''
+    ensureDir $out/share/
+    tar xf ${documentation} -C $out/share
+  '';
+
+  buildInputs = [ncurses coreutils];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2787f9119a1..c95a8264f8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -936,10 +936,13 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
-  zsh = import ../shells/zsh {
+  zshFun = lib.sumArgs (selectVersion ../shells/zsh) {
     inherit fetchurl stdenv ncurses coreutils;
+    version = "4.3.5";
   };
 
+  zsh = zshFun null;
+
 
   ### DEVELOPMENT / COMPILERS