diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index c2200841ee1c..9da451849788 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,28 +1,26 @@
-{stdenv, fetchsvn, unzip, cmake, mesa, wxGTK, zlib, libX11, gettext}:
+{stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, wxGTK, zlib, libX11,
+gettext}:
 
 stdenv.mkDerivation rec {
-  name = "kicad-svn-2518";
+  name = "kicad-20110708";
 
-  src = fetchsvn {
-    url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad;
-    rev = 2518;
-    sha256 = "05z4fnkvvy91d0krf72q8xyislwh3zg8k0gy9w18caizbla5sih5";
+  src = fetchurl {
+    url = ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad_sources-2011-07-08-BZR3044.zip;
+    sha256 = "1gr75zcf55p3xpbg1gdkdpbh5x11bawc9rcff4fskwjyc3vfiv6a";
   };
 
-  srcLibrary = fetchsvn {
-    url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad-library;
-    rev = 2518;
-    sha256 = "05sfmbp1z3hjxzcspj4vpprww5bxc6hq4alcjlc1vg6cvx2qgb9s";
+  srcLibrary = fetchbzr {
+    url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";
+    revision = 112;
+    sha256 = "49fa9ad90759cfaf522c2a62665f033688b9d84d02f31c6b2505c08a217ad312";
   };
 
+  cmakeFlags = "-DKICAD_TESTING_VERSION=ON";
+
   # They say they only support installs to /usr or /usr/local,
   # so we have to handle this.
   patchPhase = ''
     sed -i -e 's,/usr/local/kicad,'$out,g common/gestfich.cpp
-    pushd internat/ca
-    sed -i -e s/iso-8859-1/utf-8/ kicad.po
-    msgfmt -o kicad.mo kicad.po
-    popd
   '';
 
   enableParallelBuilding = true;