diff --git a/pkgs/applications/window-managers/compiz/0.5.0.nix b/pkgs/applications/window-managers/compiz/0.5.0.nix
new file mode 100644
index 00000000000..6c5f7aecf59
--- /dev/null
+++ b/pkgs/applications/window-managers/compiz/0.5.0.nix
@@ -0,0 +1,33 @@
+/*{ stdenv, fetchurl, pkgconfig, libpng, libXcomposite, libXfixes
+, libXdamage, libXrandr, libXinerama, libICE, libSM
+, startupnotification, libXrender, xextproto, mesa, gtk, libwnck, GConf
+, libgnome, libgnomeui, metacity
+, gnomegtk, glib, pango, libglade, libgtkhtml, gtkhtml, libgnomecanvas, libgnomeprint, libgnomeprintui, gnomepanel
+, librsvg, fuse
+}:*/
+args: with args;
+stdenv.mkDerivation {
+  name = "compiz-0.5.0";
+  src = fetchurl {
+    url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.5.0.tar.gz;
+    sha256 = "1fac5fc37b218k34lpxqlhs7srqxm7jly0hfncs3ghmjmxdlj03y";
+  };
+  patches = [
+    ./tfp-server-extension.patch
+  ];
+  buildInputs = [
+    pkgconfig libXrender xextproto gtk libwnck GConf libgnome libgnomeui metacity gnomegtk glib pango libglade libgtkhtml gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel librsvg fuse
+  ];
+  propagatedBuildInputs = [
+    libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
+    libICE libSM startupnotification mesa GConf
+  ];
+  configureFlags = "--enable-gtk --enable-fuse --enable-annotate --enable-librsvg";
+
+  postFixup = "
+    for i in $out/bin/*; do
+     patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
+    done
+  ";
+
+}
diff --git a/pkgs/applications/window-managers/compiz/0.6.2.nix b/pkgs/applications/window-managers/compiz/0.6.2.nix
new file mode 100644
index 00000000000..3b6b26f20f1
--- /dev/null
+++ b/pkgs/applications/window-managers/compiz/0.6.2.nix
@@ -0,0 +1,40 @@
+args : with args;
+	with builderDefs {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://releases.compiz-fusion.org/compiz/0.6.2/compiz-0.6.2.tar.bz2;
+		sha256 = "0k58bkbyqx94ch7scvn3d26296ai9nddfb6lg8v3bhbi2zj4i2n5";
+	};
+		buildInputs = [
+			    pkgconfig libXrender xextproto gtk libwnck GConf libgnome 
+			    libgnomeui metacity gnomegtk glib pango libglade libgtkhtml 
+			    gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel 
+			    librsvg fuse
+		];
+		  propagatedBuildInputs = [
+		    libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
+		    libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt
+		  ];
+		configureFlags = ["--enable-gtk" "--enable-fuse" 
+			"--enable-annotate" "--enable-librsvg"];
+	} null; /* null is a terminator for sumArgs */
+	with stringsWithDeps;
+let
+	postAll = FullDepEntry ("
+    for i in $out/bin/*; do
+     patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
+    done
+  ") [minInit doMakeInstall];
+in
+
+stdenv.mkDerivation 
+rec {
+	name = "compiz-0.6.2";
+	builder = writeScript (name + "-builder")
+		(textClosure [doConfigure doMakeInstall doForceShare postAll]);
+	meta = {
+		description = "
+	Compiz window manager
+";
+	};
+}
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index 80ae441c5f7..c8e4bcf9545 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -1,33 +1,2 @@
-{ stdenv, fetchurl, pkgconfig, libpng, libXcomposite, libXfixes
-, libXdamage, libXrandr, libXinerama, libICE, libSM
-, startupnotification, libXrender, xextproto, mesa, gtk, libwnck, GConf
-, libgnome, libgnomeui, metacity
-, gnomegtk, glib, pango, libglade, libgtkhtml, gtkhtml, libgnomecanvas, libgnomeprint, libgnomeprintui, gnomepanel
-, librsvg, fuse
-}:
-
-stdenv.mkDerivation {
-  name = "compiz-0.5.0";
-  src = fetchurl {
-    url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.5.0.tar.gz;
-    sha256 = "1fac5fc37b218k34lpxqlhs7srqxm7jly0hfncs3ghmjmxdlj03y";
-  };
-  patches = [
-    ./tfp-server-extension.patch
-  ];
-  buildInputs = [
-    pkgconfig libXrender xextproto gtk libwnck GConf libgnome libgnomeui metacity gnomegtk glib pango libglade libgtkhtml gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel librsvg fuse
-  ];
-  propagatedBuildInputs = [
-    libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
-    libICE libSM startupnotification mesa GConf
-  ];
-  configureFlags = "--enable-gtk --enable-fuse --enable-annotate --enable-librsvg";
-
-  postFixup = "
-    for i in $out/bin/*; do
-     patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
-    done
-  ";
-
-}
+args : 
+(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f07037852c..8f5e5494fc8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3371,7 +3371,7 @@ rec {
         };
     };
 
-  compiz = assert mesaSupported; import ../applications/window-managers/compiz {
+  compiz_050 = assert mesaSupported; import ../applications/window-managers/compiz/0.5.0.nix {
     inherit fetchurl stdenv pkgconfig libpng mesa;
     inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
       libXinerama libICE libSM libXrender xextproto;
@@ -3384,6 +3384,37 @@ rec {
     gnomegtk = gnome.gtk;
     inherit librsvg fuse;
   };
+ 
+ compiz_062 = assert mesaSupported; import ../applications/window-managers/compiz/0.6.2.nix {
+ 	inherit lib builderDefs stringsWithDeps;
+    inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt;
+    inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
+      libXinerama libICE libSM libXrender xextproto;
+    inherit (gnome) startupnotification libwnck GConf;
+    inherit (gtkLibs) gtk;
+    inherit (gnome) libgnome libgnomeui metacity
+	      glib pango libglade libgtkhtml gtkhtml
+              libgnomecanvas libgnomeprint
+              libgnomeprintui gnomepanel;
+    gnomegtk = gnome.gtk;
+    inherit librsvg fuse;
+  };
+
+  compiz = assert mesaSupported; import ../applications/window-managers/compiz {
+ 	inherit lib builderDefs stringsWithDeps;
+    inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt;
+    inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
+      libXinerama libICE libSM libXrender xextproto;
+    inherit (gnome) startupnotification libwnck GConf;
+    inherit (gtkLibs) gtk;
+    inherit (gnome) libgnome libgnomeui metacity
+	      glib pango libglade libgtkhtml gtkhtml
+              libgnomecanvas libgnomeprint
+              libgnomeprintui gnomepanel;
+    gnomegtk = gnome.gtk;
+    inherit librsvg fuse;
+    version = getConfig ["compiz" "version"] "0.5.0";
+  };
   
   compizExtra = import ../applications/window-managers/compiz/extra.nix {
     inherit fetchurl stdenv pkgconfig compiz perl perlXMLParser dbus;
diff --git a/pkgs/top-level/version-stub.nix b/pkgs/top-level/version-stub.nix
new file mode 100644
index 00000000000..c8e4bcf9545
--- /dev/null
+++ b/pkgs/top-level/version-stub.nix
@@ -0,0 +1,2 @@
+args : 
+(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args