diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
index 27e26d6d5df7..990a25591c65 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -1,22 +1,44 @@
-{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xorg}:
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, wxGTK30, libav, lua5_1, curl,
+  libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, mesa, glee }:
 
 stdenv.mkDerivation rec {
-  name = "electricsheep-2.6.8";
+  name = "${pname}-${version}";
+  pname = "electricsheep";
+  version = "2.7b33-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "598d93d90573b69559463567540aac8bc8a5b3f3";
   
-  src = fetchurl {
-    url = "http://electricsheep.org/${name}.tar.gz";
-    sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5";
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "scottdraves";
+    repo = "${pname}";
+    sha256 = "1zcn6q0dl0ip85b8b4kisc5lqjb1cs0hpzlx4l5995l6mhq9kxis";
   };
 
-  buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  preInstall = ''
-    installFlags=GNOME_DATADIR=$out
-    mkdir -p $out/control-center/screensavers
+  buildInputs = [
+    libtool wxGTK30 libav lua5_1 curl libpng xorg.libXrender pkgconfig
+    flam3 libgtop boost tinyxml freeglut mesa glee
+  ];
+
+  preAutoreconf = ''
+    cd client_generic
+    sed -i '/ACX_PTHREAD/d' configure.ac
   '';
 
-  meta = {
+  configureFlags = [
+   "CPPFLAGS=-I${glee}/include/GL"
+  ];
+
+  preBuild = ''
+    sed -i "s|/usr|$out|" Makefile
+  '';
+
+  meta = with stdenv.lib; {
     description = "Electric Sheep, a distributed screen saver for evolving artificial organisms";
     homepage = http://electricsheep.org/;
+    maintainers = maintainers.nand0p;
+    platforms = platforms.linux;
+    license = licenses.gpl1;
   };
 }
diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix
new file mode 100644
index 000000000000..f4e0faffb0e1
--- /dev/null
+++ b/pkgs/tools/graphics/flam3/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "flam3";
+  version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "e0801543538451234d7a8a240ba3b417cbda5b21";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "scottdraves";
+    repo = "${pname}";
+    sha256 = "18iyj16k0sn3fs52fj23lj31xi4avlddhbib6kk309576nlxp17w";
+  };
+
+  buildInputs = [ zlib libpng libxml2 libjpeg ];
+
+  meta = with stdenv.lib; {
+    description = "Cosmic recursive fractal flames";
+    homepage = http://flam3.com/;
+    maintainers = maintainers.nand0p;
+    platforms = platforms.linux;
+    license = licenses.cc-by-nc-sa-20;
+  };
+}
diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix
new file mode 100644
index 000000000000..bdfecb9de735
--- /dev/null
+++ b/pkgs/tools/graphics/glee/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchgit, cmake, mesa, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "glee";
+  rev = "f727ec7463d514b6279981d12833f2e11d62b33d";
+  version = "20170205-${stdenv.lib.strings.substring 0 7 rev}";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://git.code.sf.net/p/${pname}/${pname}";
+    sha256 = "13mf3s7nvmj26vr2wbcg08l4xxqsc1ha41sx3bfghvq8c5qpk2ph";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ mesa xorg.libX11 ];
+
+  configureScript = ''
+    cmake
+  '';
+
+  preInstall = ''
+    sed -i 's/readme/Readme/' cmake_install.cmake
+  '';
+
+  meta = with stdenv.lib; {
+    description = "GL Easy Extension Library";
+    homepage = https://sourceforge.net/p/glee/glee/;
+    maintainers = with maintainers; [ nand0p ];
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b587b4fd430..a52ccc535a27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17428,6 +17428,10 @@ with pkgs;
 
   electricsheep = callPackage ../misc/screensavers/electricsheep { };
 
+  flam3 = callPackage ../tools/graphics/flam3 { };
+
+  glee = callPackage ../tools/graphics/glee { };
+
   fakenes = callPackage ../misc/emulators/fakenes { };
 
   faust = self.faust2;