diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix
index 037d1e1ec99..62883a1c545 100644
--- a/pkgs/shells/es/default.nix
+++ b/pkgs/shells/es/default.nix
@@ -1,34 +1,28 @@
-{ stdenv, fetchgit, readline, yacc, autoconf, automake, libtool }:
+{ stdenv, fetchurl, readline, yacc }:
 
 let
-  version = "git-2015-04-11";
+  version = "0.9.1";
 in
 stdenv.mkDerivation {
 
   name = "es-${version}";
 
-  src = fetchgit {
-    url = "git://github.com/wryun/es-shell";
-    rev = "fdf29d5296ce3a0ef96d2b5952cff07878753975";
-    sha256 = "12faa9b5ffwydgwyjp57zr19sqap2ma3crj6wd2rx1hv30dkll7p";
+  src = fetchurl {
+    url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz";
+    sha256 = "1fplzxc6lncz2lv2fyr2ig23rgg5j96rm2bbl1rs28mik771zd5h";
   };
 
-  buildInputs = [ readline yacc libtool autoconf automake ];
-
-  preConfigure =
-    ''
-      aclocal
-      autoconf
-      libtoolize -qi
-    '';
-
-  configureFlags="--with-readline --prefix=$(out) --bindir=$(out)/bin --mandir=$(out)/man";
-
-  preInstall = ''
-    mkdir -p $out/bin
-    mkdir -p $out/man/man1
+  # The distribution tarball does not have a single top-level directory.
+  preUnpack = ''
+    mkdir $name
+    cd $name
+    sourceRoot=.
   '';
 
+  buildInputs = [ readline yacc ];
+
+  configureFlags = [ "--with-readline" ];
+
   meta = with stdenv.lib; {
     description = "Es is an extensible shell";
     longDescription =