diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
new file mode 100644
index 00000000000..c36fa1d67f7
--- /dev/null
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, libpng, libXcomposite, libXfixes
+, libXdamage, libXrandr, libXinerama, libICE, libSM
+, startupnotification, libXrender, xextproto, mesa, gtk
+}:
+
+stdenv.mkDerivation {
+  name = "compiz-0.3.6";
+  src = fetchurl {
+    url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.3.6.tar.bz2;
+    sha256 = "0z7cprg510x1sjzsj8h02l1q5h7qvhcn7z94b7a48pxv124z7qpg";
+  };
+  patches = fetchurl {
+    url = http://gandalfn.club.fr/ubuntu/compiz-patch/02-tfp-server-extension.patch;
+    sha256 = "1hi53ajypmgsyfz7cziccdk9f8mn3pfl255yjzl0v15nv5kacmiq";
+  };
+  buildInputs = [
+    pkgconfig libpng libXcomposite libXfixes libXdamage libXrandr
+    libXinerama libICE libSM startupnotification libXrender xextproto
+    mesa gtk
+  ];
+  configureFlags = "--disable-gconf";
+}
diff --git a/pkgs/development/libraries/gnome/default.nix b/pkgs/development/libraries/gnome/default.nix
index 329aea671a9..1a1b043ea93 100644
--- a/pkgs/development/libraries/gnome/default.nix
+++ b/pkgs/development/libraries/gnome/default.nix
@@ -181,4 +181,9 @@ rec {
     input = desktop.libsoup;
   };
   
+  startupnotification = (import ./startup-notification) {
+    inherit stdenv fetchurl pkgconfig x11;
+    input = desktop.startupnotification;
+  };
+  
 }
diff --git a/pkgs/development/libraries/gnome/startup-notification/default.nix b/pkgs/development/libraries/gnome/startup-notification/default.nix
new file mode 100644
index 00000000000..b8df1c22edc
--- /dev/null
+++ b/pkgs/development/libraries/gnome/startup-notification/default.nix
@@ -0,0 +1,6 @@
+{input, stdenv, fetchurl, pkgconfig, x11}:
+
+stdenv.mkDerivation {
+  inherit (input) name src;
+  buildInputs = [pkgconfig x11];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e625a877ae..5706f15ad8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2537,6 +2537,14 @@ rec {
         };
     };
 
+  compiz = import ../applications/window-managers/compiz {
+    inherit fetchurl stdenv pkgconfig libpng mesa;
+    inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
+      libXinerama libICE libSM libXrender xextproto;
+    inherit (gnome) startupnotification;
+    inherit (gtkLibs) gtk;
+  };
+
   cua = import ../applications/editors/emacs-modes/cua {
     inherit fetchurl stdenv;
   };