diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
new file mode 100644
index 000000000000..cacfaf15a21d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with go16Packages;
+
+buildGoPackage rec {
+  name = "terraform-${version}";
+  version = "0.6.15";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/hashicorp/terraform";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/hashicorp/terraform";
+    sha256 = "1mf98hagb0yp40g2mbar7aw7hmpq01clnil6y9khvykrb33vy0nb";
+  };
+
+  postInstall = ''
+    # prefix all the plugins with "terraform-"
+    for i in $bin/bin/*; do
+      if [[ ! $(basename $i) =~ terraform* ]]; then
+        mv -v $i $bin/bin/terraform-$(basename $i);
+      fi
+    done
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23af18ea0760..a9d29823f499 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16763,7 +16763,7 @@ in
 
   sqsh = callPackage ../development/tools/sqsh { };
 
-  terraform = goPackages.terraform.bin // { outputs = [ "bin" ]; };
+  terraform = callPackage ../applications/networking/cluster/terraform { };
 
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 0bd9f10f9dd6..a7699c282729 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3330,23 +3330,6 @@ let
     subPackages = [ "./" ]; # prevent building _demos
   };
 
-  terraform = buildFromGitHub {
-    rev = "v0.6.15";
-    owner = "hashicorp";
-    repo = "terraform";
-    disabled = isGo14 || isGo15;
-    sha256 = "1mf98hagb0yp40g2mbar7aw7hmpq01clnil6y9khvykrb33vy0nb";
-
-    postInstall = ''
-      # prefix all the plugins with "terraform-"
-      for i in $bin/bin/*; do
-        if [[ ! $(basename $i) =~ terraform* ]]; then
-          mv -v $i $bin/bin/terraform-$(basename $i);
-        fi
-      done
-    '';
-  };
-
   testify = buildGoPackage rec {
     rev = "089c7181b8c728499929ff09b62d3fdd8df8adff";
     name = "testify-${stdenv.lib.strings.substring 0 7 rev}";