diff --git a/pkgs/tools/misc/nixbot/default.nix b/pkgs/tools/misc/nixbot/default.nix
new file mode 100644
index 00000000000..6fb0b9c8201
--- /dev/null
+++ b/pkgs/tools/misc/nixbot/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+  name = "nixbot-unstable-2016-10-09";
+
+  src = fetchFromGitHub {
+    owner = "domenkozar";
+    repo = "nixbot";
+    rev = "dc490e4954cb08f0eff97f74ad39dedb54670aa9";
+    sha256 = "1l8rlhd2b7x5m79vb2vgszachygasv0pk8drnwgxyvsn0k88xcan";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    pygit2 pyramid waitress github3_py
+  ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    desciption = "Github bot for reviewing/testing pull requests with the help of Hydra";
+    maintainers = with maintainers; [ domenkozar fpletz globin ];
+    license = licenses.asl20;
+    homepage = https://github.com/domenkozar/nixbot;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0994614a9c..0df33d522e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2867,6 +2867,8 @@ in
 
   nitrogen = callPackage ../tools/X11/nitrogen {};
 
+  nixbot = callPackage ../tools/misc/nixbot {};
+
   nkf = callPackage ../tools/text/nkf {};
 
   nlopt = callPackage ../development/libraries/nlopt {};