diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix
index 870664c252a..715b009a17e 100644
--- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchurl, coreutils, twisted }:
 
 buildPythonPackage (rec {
-  name = "buildbot-slave-0.8.8";
+  name = "buildbot-slave-0.8.10";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://buildbot.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1k1pk3y0rk6j01wc491jblryr4ajqg1ing9m3sjaw9s5sga34xcb";
+    url = "https://pypi.python.org/packages/source/b/buildbot-slave/${name}.tar.gz";
+    sha256 = "09pncw44c7vqrl7zyn1nvfismiqi9s51axk9cqxn9gq7jhj38mpg";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index ccbf74e528e..8193845770c 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -9,12 +9,12 @@
 assert enableDebugClient -> pygobject != null && pyGtkGlade != null;
 
 buildPythonPackage (rec {
-  name = "buildbot-0.8.8";
+  name = "buildbot-0.8.10";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://buildbot.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1l1rsy82zv8582wypw00ac0k0wsr82ky74f3np4clbrxv3ry64sh";
+    url = "https://pypi.python.org/packages/source/b/buildbot/${name}.tar.gz";
+    sha256 = "1x5513mjvd3mwwadawk6v3ca2wh5mcmgnn5h9jhq1jw1plp4v5n4";
   };
 
   patchPhase =