diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix
new file mode 100644
index 00000000000..b5f33dff528
--- /dev/null
+++ b/pkgs/servers/monitoring/heapster/default.nix
@@ -0,0 +1,27 @@
+{ lib, goPackages, fetchFromGitHub, docker }:
+
+goPackages.buildGoPackage rec {
+  rev = "3057a2c07061c8d9ffaf77e5442ffd7512ac0133";
+  name = "heapster-${lib.strings.substring 0 7 rev}";
+  goPackagePath = "k8s.io/heapster";
+  subPackages = [ "./" ];
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "kubernetes";
+    repo = "heapster";
+    sha256 = "057z9imgd2gvcbvahja3i26jzgm33dmfaxraakmcr4a2xfhj50hq";
+  };
+
+  preBuild = ''
+    export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
+  '';
+
+  meta = with lib; {
+    description = "Compute Resource Usage Analysis and Monitoring of Container Clusters";
+    license = licenses.asl20;
+    homepage = https://github.com/kubernetes/heapster;
+    maintainers = with maintainers; [ offline ];
+    platforms = with platforms; docker.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66382269eba..ea68679aedd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9146,6 +9146,8 @@ let
 
   groovebasin = callPackage ../applications/audio/groovebasin { };
 
+  heapster = (callPackage ../servers/monitoring/heapster { }).bin // { outputs = ["bin"]; };
+
   hbase = callPackage ../servers/hbase {};
 
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };