diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index efa820b0b6a2..7efacafd6a1c 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig dbus libconfig libdrm libxml2 mesa pcre
     libXcomposite libXfixes libXdamage libXinerama libXrandr libXrender libXext ];
-  buildFlagsArray = ["CFLAGS=-O3 -fomit-frame-pointer"];
   installFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
new file mode 100644
index 000000000000..be2586c9e270
--- /dev/null
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,
+  docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre,
+  pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
+  libXrandr, libXrender }:
+
+stdenv.mkDerivation {
+  name = "compton-git-2015-04-20";
+
+  src = fetchFromGitHub {
+    owner  = "chjj";
+    repo   = "compton";
+    rev    = "b1889c1245e6f47eedfae6063100d5a16f584e2b";
+    sha256 = "0brnbidxi7wg08yiwgnijzcyqv5lnkd74xzfymvb0i7pgy465vaf";
+  };
+
+  buildInputs = [
+    asciidoc
+    dbus
+    docbook_xml_dtd_45
+    docbook_xml_xslt
+    libXcomposite
+    libXdamage
+    libXext
+    libXfixes
+    libXinerama
+    libXrandr
+    libXrender
+    libconfig
+    libdrm
+    libxml2
+    libxslt
+    mesa
+    pcre
+    pkgconfig
+  ];
+
+  installFlags = "PREFIX=$(out)";
+
+  meta = with stdenv.lib; {
+    description =
+      "A fork of XCompMgr, a sample compositing manager for X servers (git version)";
+    homepage = https://github.com/chjj/compton/;
+    license = licenses.mit;
+    longDescription = ''
+      A fork of XCompMgr, which is a sample compositing manager for X
+      servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
+      extensions.  It enables basic eye-candy effects. This fork adds
+      additional features, such as additional effects, and a fork at a
+      well-defined and proper place.
+    '';
+    maintainer = maintainers.ertes;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c2d33246504..dda546bb8b8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12524,6 +12524,8 @@ let
 
   compton = callPackage ../applications/window-managers/compton { };
 
+  compton-git = callPackage ../applications/window-managers/compton/git.nix { };
+
   xdaliclock = callPackage ../tools/misc/xdaliclock {};
 
   xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };