diff --git a/.gitignore b/.gitignore
index e444923247..cfa78185b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ gulpfile.js
 src/**/*.js
 src/**/*.map
 src/**/*.d.ts
+static/bin/garden.js
 test/**/*.js
 test/**/*.map
 *.tgz
diff --git a/bin/garden b/bin/garden
index c9e4b997e5..dd058145c1 100755
--- a/bin/garden
+++ b/bin/garden
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 garden_root=$(cd `dirname $0` && cd $(git rev-parse --show-toplevel) && pwd)
-node ${garden_root}/build/src/bin/garden.js "$@"
+node ${garden_root}/build/static/bin/garden.js "$@"
diff --git a/bin/garden-debug b/bin/garden-debug
index 6d0ddf8e56..f531709281 100755
--- a/bin/garden-debug
+++ b/bin/garden-debug
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 garden_root=$(cd `dirname $0` && cd $(git rev-parse --show-toplevel) && pwd)
-node --inspect ${garden_root}/build/src/bin/garden.js "$@"
+node --inspect ${garden_root}/build/static/bin/garden.js "$@"
diff --git a/gulpfile.ts b/gulpfile.ts
index 94eb23eced..f8ab8f9ceb 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -80,7 +80,7 @@ process.on("SIGINT", die)
 process.on("SIGTERM", die)
 
 gulp.task("add-version-files", (cb) => {
-  const gardenBinPath = join(destDir, "src", "bin", "garden.js")
+  const gardenBinPath = join(destDir, "static", "bin", "garden")
   const proc = _spawn("node", [gardenBinPath, "scan", "--output=json"])
 
   proc.on("error", err => cb(err))
diff --git a/package.json b/package.json
index e4d0365e9f..68d90f5623 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   },
   "preferGlobal": true,
   "bin": {
-    "garden": "./dist/src/bin/garden.js"
+    "garden": "./dist/static/bin/garden"
   },
   "files": [
     "dist"
diff --git a/src/bin/garden.ts b/src/bin/garden.ts
deleted file mode 100755
index 5d1209e106..0000000000
--- a/src/bin/garden.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (C) 2018 Garden Technologies, Inc. <info@garden.io>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { run } from "../cli/cli"
-
-run()
diff --git a/static/bin/garden b/static/bin/garden
new file mode 100755
index 0000000000..e4e3beac3a
--- /dev/null
+++ b/static/bin/garden
@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+const cli = require("../../src/cli/cli")
+
+cli.run()
diff --git a/test/integ/run b/test/integ/run
index d035ce9c0a..6b7229c623 100755
--- a/test/integ/run
+++ b/test/integ/run
@@ -2,7 +2,7 @@
 
 here=$(cd `dirname $0` && pwd)
 garden_root=$(cd ${here} && cd $(git rev-parse --show-toplevel) && pwd)
-garden_bin="node ${garden_root}/build/src/bin/garden.js"
+garden_bin="node ${garden_root}/build/static/bin/garden"
 
 cd ${garden_root}/examples/hello-world