diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
new file mode 100644
index 00000000000..64674d78ac7
--- /dev/null
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xlibs}:
+
+stdenv.mkDerivation rec {
+  name = "electricsheep-2.6.8";
+  
+  src = fetchurl {
+    url = "http://electricsheep.org/${name}.tar.gz";
+    sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5";
+  };
+
+  buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibs xlibs.libXv];
+
+  preInstall = ''
+    installFlags=GNOME_DATADIR=$out
+    ensureDir $out/control-center/screensavers
+  '';
+
+  meta = {
+    description = "Electric Sheep, a distributed screen saver for evolving artificial organisms";
+    homepage = http://electricsheep.org/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbc35199a1a..498632e0930 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7421,6 +7421,10 @@ let
     inherit fetchurl stdenv perl zlib bzip2;
   };
 
+  electricsheep = import ../misc/screensavers/electricsheep {
+    inherit fetchurl stdenv pkgconfig expat zlib libpng libjpeg xlibs;
+  };
+
   foldingathome = import ../misc/foldingathome {
     inherit fetchurl stdenv;
   };