diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index bb7464391452..9892081708ae 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -50,7 +50,14 @@
   };
 
   xf86videoopenchrome = attrs: attrs // {
-    buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
+    src = args.fetchsvn {
+      url = http://svn.openchrome.org/svn/trunk;
+      md5 = "9a64a317d1f0792c5709e516c14f383b";
+      rev = 754;
+      };
+    buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa args.automake args.autoconf args.libtool xorg.libXext];
+    preConfigure = "chmod +x autogen.sh";
+    configureScript = "./autogen.sh";
   };
 
   xkbcomp = attrs: attrs // {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2adc06fe72c..5ec622db32ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4522,9 +4522,10 @@ let
   };
 
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
-    inherit fetchurl stdenv pkgconfig freetype fontconfig
+    inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa mesaHeaders
-      xkeyboard_config dbus hal libuuid openssl gperf m4;
+      xkeyboard_config dbus hal libuuid openssl gperf m4
+      automake autoconf libtool;
 
     # !!! pythonBase is use instead of python because this cause an infinite
     # !!! recursion when the flag python.full is set to true.  Packages