diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix
deleted file mode 100644
index a5f86d105c3..00000000000
--- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ stdenv, buildPythonApplication, fetchurl, coreutils, twisted }:
-
-buildPythonApplication (rec {
-  name = "buildbot-slave-0.8.10";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "mirror://pypi/b/buildbot-slave/${name}.tar.gz";
-    sha256 = "09pncw44c7vqrl7zyn1nvfismiqi9s51axk9cqxn9gq7jhj38mpg";
-  };
-
-  patchPhase = ''
-    substituteInPlace buildslave/scripts/logwatcher.py --replace /usr/bin/tail ${coreutils}/bin/tail
-  '';
-
-  propagatedBuildInputs = [ twisted ];
-
-  # What's up with this?! 'trial' should be 'test', no?
-  #
-  # running tests
-  # usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
-  #    or: setup.py --help [cmd1 cmd2 ...]
-  #    or: setup.py --help-commands
-  #    or: setup.py cmd --help
-  #
-  # error: invalid command 'trial'
-  doCheck = false;
-
-  postInstall = ''
-    mkdir -p "$out/share/man/man1"
-    cp docs/buildslave.1 "$out/share/man/man1"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://buildbot.net/;
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    description = "Continuous integration system that automates the build/test cycle";
-
-    longDescription =
-      '' The BuildBot is a system to automate the compile/test cycle
-         required by most software projects to validate code changes.  By
-         automatically rebuilding and testing the tree each time something
-         has changed, build problems are pinpointed quickly, before other
-         developers are inconvenienced by the failure.  The guilty
-         developer can be identified and harassed without human
-         intervention.  By running the builds on a variety of platforms,
-         developers who do not have the facilities to test their changes
-         everywhere before checkin will at least know shortly afterwards
-         whether they have broken the build or not.  Warning counts, lint
-         checks, image size, compile time, and other build parameters can
-         be tracked over time, are more visible, and are therefore easier
-         to improve.
-
-         The overall goal is to reduce tree breakage and provide a platform
-         to run tests or code-quality checks that are too annoying or
-         pedantic for any human to waste their time with.  Developers get
-         immediate (and potentially public) feedback about their changes,
-         encouraging them to be more careful about testing before checking
-         in code.
-      '';
-    maintainers = with maintainers; [ bjornfor ];
-    platforms = platforms.all;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ee3aaa70b24..07ec4a424a5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -26,7 +26,6 @@ doNotDisplayTwice rec {
   bar-xft = lemonbar-xft;  # added 2015-01-16
   bridge_utils = bridge-utils;  # added 2015-02-20
   btrfsProgs = btrfs-progs; # added 2016-01-03
-  buildbotSlave = buildbot-slave;  # added 2014-12-09
   bundler_HEAD = bundler; # added 2015-11-15
   checkbashism = checkbashisms; # added 2016-08-16
   cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a008a119e76..fa8d57cf8ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6227,11 +6227,7 @@ in
     wxGTK = wxGTK30;
   };
 
-  buildbot-slave = callPackage ../development/tools/build-managers/buildbot-slave {
-    inherit (pythonPackages) twisted;
-  };
-
-  buildbot = callPackage ../development/tools/build-managers/buildbot/9.nix { };
+  buildbot = callPackage ../development/tools/build-managers/buildbot { };
   buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix { };
   buildbot-plugins = callPackage ../development/tools/build-managers/buildbot/plugins.nix { };
   buildbot-ui = self.buildbot.override {