diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
new file mode 100644
index 00000000000..d6b82c38d01
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -0,0 +1,48 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "prometheus-${version}";
+  version = "0.17.0";
+  rev = "${version}";
+
+  goPackagePath = "github.com/prometheus/prometheus";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/prometheus";
+    sha256 = "176198krna2i37dfhwsqi7m36sqn175yiny6n52vj27mc9s8ggzx";
+  };
+
+  docheck = true;
+
+  preBuild = ''
+    export GO15VENDOREXPERIMENT=1
+  '';
+
+  buildFlagsArray = let t = "${goPackagePath}/version"; in ''
+    -ldflags=
+       -X ${t}.Version=${version}
+       -X ${t}.Revision=unknown
+       -X ${t}.Branch=unknown
+       -X ${t}.BuildUser=nix@nixpkgs
+       -X ${t}.BuildDate=unknown
+       -X ${t}.GoVersion=${stdenv.lib.getVersion go}
+  '';
+
+  preInstall = ''
+    mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
+    cp -a $src/documentation/* $bin/share/doc/prometheus
+    cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Service monitoring system and time series database";
+    homepage = http://prometheus.io;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d37992ed54..1633c90f837 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10178,7 +10178,7 @@ in
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
   prom2json = goPackages.prometheus.prom2json.bin // { outputs = [ "bin" ]; };
-  prometheus = goPackages.prometheus.prometheus.bin // { outputs = [ "bin" ]; };
+  prometheus = callPackage ../servers/monitoring/prometheus { };
   prometheus-alertmanager = goPackages.prometheus.alertmanager.bin // { outputs = [ "bin" ]; };
   prometheus-cli = goPackages.prometheus.cli.bin // { outputs = [ "bin" ]; };
   prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin // { outputs = [ "bin" ]; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f1f8e33c59b..a3a1aaf3371 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2788,57 +2788,6 @@ let
     };
   };
 
-  prometheus.prometheus = buildFromGitHub rec {
-    rev = "0.17.0";
-    owner = "prometheus";
-    repo = "prometheus";
-    sha256 = "176198krna2i37dfhwsqi7m36sqn175yiny6n52vj27mc9s8ggzx";
-
-    buildInputs = [
-      # consul
-      # dns
-      # fsnotify.v1
-      # go-zookeeper
-      # goleveldb
-      # httprouter
-      # logrus
-      # net
-      # prometheus.client_golang
-      # prometheus.log
-      # yaml-v2
-    ];
-
-    docheck = true;
-
-    preBuild = ''
-      export GO15VENDOREXPERIMENT=1
-    '';
-
-    buildFlagsArray = let t = "github.com/${owner}/${repo}/version"; in ''
-      -ldflags=
-         -X ${t}.Version=${rev}
-         -X ${t}.Revision=unknown
-         -X ${t}.Branch=unknown
-         -X ${t}.BuildUser=nix@nixpkgs
-         -X ${t}.BuildDate=unknown
-         -X ${t}.GoVersion=${stdenv.lib.getVersion go}
-    '';
-
-    preInstall = ''
-      mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
-      cp -a $src/documentation/* $bin/share/doc/prometheus
-      cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
-    '';
-
-    meta = with stdenv.lib; {
-      description = "Service monitoring system and time series database";
-      homepage = http://prometheus.io;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   prometheus.pushgateway = buildFromGitHub rec {
     rev = "0.1.1";
     owner = "prometheus";