diff --git a/pkgs/development/tools/build-managers/buildbot/9.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
similarity index 66%
rename from pkgs/development/tools/build-managers/buildbot/9.nix
rename to pkgs/development/tools/build-managers/buildbot/default.nix
index 0f33cd0c6642..b38395693e3b 100644
--- a/pkgs/development/tools/build-managers/buildbot/9.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -7,10 +7,10 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot";
-  version = "0.9.0rc2";
+  version = "0.9.0rc3";
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "06xzbjzji3by4hldwr850fc989ymsfl2s8nil21klv2g00dgmcmk";
+    sha256 = "18238n9l0pfivb23csy5lnkx91fcm4jgmhxn03f2nfnp00rlppzb";
   };
 
   buildInputs = with pythonPackages; [
@@ -59,15 +59,6 @@ pythonPackages.buildPythonApplication (rec {
   ] ++ plugins;
 
   preInstall = ''
-    # buildbot tries to import 'buildslaves' but does not
-    # include the module in it's package, so get rid of those references
-    sed -i.bak -e '66,$d' buildbot/test/__init__.py
-    sed -i.bak -e '506,$d' buildbot/test/unit/test_worker_base.py
-    sed -i.bak -e '648,$d' buildbot/test/unit/test_worker_ec2.py
-    sed -i.bak -e '289,$d' buildbot/test/unit/test_worker_libvirt.py
-    sed -i.bak -e '190,$d' buildbot/test/unit/test_worker_openstack.py
-    sed -i.bak -e '60,84d' buildbot/test/integration/test_configs.py
-
     # writes out a file that can't be read properly
     sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py
   '';
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index 177b7b3d946b..384452e27d9c 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -5,21 +5,17 @@
 
 let
   buildbot-pkg = pythonPackages.buildPythonPackage rec {
-    name = "buildbot-pkg-${version}";
-    version = "0.9.0rc2";
+    name = "${pname}-${version}";
+    pname = "buildbot-pkg";
+    version = "0.9.0rc3";
 
     src = fetchurl {
-      url = "https://pypi.python.org/packages/95/47/1fef931d410cc24127564c2e193e7c1c184f5c5f481930f77c6d6840cfab/${name}.tar.gz";
-      sha256 = "01wc9bmqq1rfayqnjm7rkjhbcj7h6ah4vv10s6hglnq9s4axvxp6";
+      url = "mirror://pypi/b/${pname}/${name}.tar.gz";
+      sha256 = "0a05dgc5nn6sx3nicfvqwar9iy8yxhq92688dhs5p6mzjxaprlxm";
     };
 
     propagatedBuildInputs = with pythonPackages; [ setuptools ];
 
-    # doesn't seem to break without this...
-    patchPhase = ''
-      sed -i.bak -e '/"setuptools >= 21.2.1",/d' setup.py
-    '';
-
     meta = with stdenv.lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot Packaging Helper";
@@ -31,14 +27,15 @@ let
 in {
 
   www = pythonPackages.buildPythonPackage rec {
-    name = "buildbot_www-${version}";
-    version = "0.9.0rc2";
+    name = "${pname}-${version}";
+    pname = "buildbot_www";
+    version = "0.9.0rc3";
 
     # NOTE: wheel is used due to buildbot circular dependency
     format = "wheel";
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e0/d7/f1023cdb7340a15ee1fc9916e87c4d634405a87164a051e2c59bf9d51ef1/${name}-py2-none-any.whl";
-      sha256 = "1006x56x4w4p2mbrzm7jy51c0xxz48lzhdwvx7j4hrjs07mapndj";
+      url = "https://pypi.python.org/packages/93/1e/09e329fc831ae4f5be05eb3363c9028ab7e26e9c7e5d89e3aa66c3f25d9d/${name}-py2-none-any.whl";
+      sha256 = "0fy2v7y1kc53zm67ddx85yz5qh4b7hmcbfzmsziiv9n83a0qh1i6";
     };
 
     propagatedBuildInputs = [ buildbot-pkg ];
@@ -52,12 +49,13 @@ in {
   };
 
   console-view = pythonPackages.buildPythonPackage rec {
-    name = "buildbot-console-view-${version}";
-    version = "0.9.0rc2";
+    name = "${pname}-${version}";
+    pname = "buildbot-console-view";
+    version = "0.9.0rc3";
 
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f4/51/e24cc1b596e5b262a272cba3687476a13ec7d9ea24bf1f4fd0cd72902bb6/${name}.tar.gz";
-      sha256 = "0970gq1sxnfd0nlrnd3mj25i3cginlw2pj5ffqsd57n5hlqg48ib";
+      url = "mirror://pypi/b/${pname}/${name}.tar.gz";
+      sha256 = "09yfqrnwfambg1j4x7ywnjg4xfhvv6f242zzh35fwj64cnqmqx07";
     };
 
     propagatedBuildInputs = [ buildbot-pkg ];
@@ -71,12 +69,13 @@ in {
   };
 
   waterfall-view = pythonPackages.buildPythonPackage rec {
-    name = "buildbot-waterfall-view-${version}";
-    version = "0.9.0rc2";
+    name = "${pname}-${version}";
+    pname = "buildbot-waterfall-view";
+    version = "0.9.0rc3";
 
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c2/21/3895355b05f91977a8b8e5435f85354e927c2ef547a25432a6bacf792a67/${name}.tar.gz";
-      sha256 = "1zybrbbsyplv93zkin8cb3z1bqqr6px4p203ldcpn7lds5s9vk00";
+      url = "mirror://pypi/b/${pname}/${name}.tar.gz";
+      sha256 = "0xpqxj3mmwl5xdhm3p52shl24d85qapdk4v66f9hrb9pnk5k4a81";
     };
 
     propagatedBuildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 36b57a41aa73..2c8e17a37c00 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -4,12 +4,13 @@
 }:
 
 pythonPackages.buildPythonApplication (rec {
-  name = "buildbot-worker-${version}";
-  version = "0.9.0rc2";
+  name = "${pname}-${version}";
+  pname = "buildbot-worker";
+  version = "0.9.0rc3";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/6a/be/ae80e5e87bc92ac813cd944c08d3b6168090145fc168e7a553e88c07067a/${name}.tar.gz";
-    sha256 = "19l28s2fyzln6nv2ypbdg11xiz7lrjy0n64fzhngfalv61x2bp8j";
+    url = "mirror://pypi/b/${pname}/${name}.tar.gz";
+    sha256 = "0wqn2176rk7hc27r4hfy5qnxp0nr9iis5nyzg5x07xljnsspnhy1";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];