diff --git a/distributions/nuxt-legacy/bin/nuxt-legacy.js b/distributions/nuxt-legacy/bin/nuxt-legacy.js
index e9a1f2a1eb..741e63bb38 100755
--- a/distributions/nuxt-legacy/bin/nuxt-legacy.js
+++ b/distributions/nuxt-legacy/bin/nuxt-legacy.js
@@ -24,4 +24,4 @@ register({
   ]
 })
 
-require('@nuxt/cli/bin/nuxt.js')
+require('@nuxt/cli').run()
diff --git a/distributions/nuxt-legacy/package.json b/distributions/nuxt-legacy/package.json
index dc3cd4120d..b327469276 100644
--- a/distributions/nuxt-legacy/package.json
+++ b/distributions/nuxt-legacy/package.json
@@ -42,9 +42,7 @@
   "files": [
     "bin"
   ],
-  "bin": {
-    "nuxt-legacy": "bin/nuxt-legacy.js"
-  },
+  "bin": "bin/nuxt-legacy.js",
   "dependencies": {
     "@babel/core": "^7.1.6",
     "@babel/polyfill": "^7.0.0",
diff --git a/distributions/nuxt-start/bin/nuxt-start.js b/distributions/nuxt-start/bin/nuxt-start.js
new file mode 100755
index 0000000000..6496c3d2b2
--- /dev/null
+++ b/distributions/nuxt-start/bin/nuxt-start.js
@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+const { name } = require('../package.json')
+const isEdge = name.indexOf('-edge') !== -1
+const cli = require(isEdge ? '@nuxt/cli-edge' : '@nuxt/cli')
+cli.run()
diff --git a/distributions/nuxt-start/package.json b/distributions/nuxt-start/package.json
index f371688d9a..76794a8144 100644
--- a/distributions/nuxt-start/package.json
+++ b/distributions/nuxt-start/package.json
@@ -40,9 +40,11 @@
     }
   ],
   "files": [
+    "bin",
     "dist"
   ],
   "main": "dist/nuxt-start.js",
+  "bin": "bin/nuxt-start.js",
   "dependencies": {
     "@nuxt/cli": "^2.2.0",
     "@nuxt/common": "^2.2.0",
diff --git a/distributions/nuxt/bin/nuxt.js b/distributions/nuxt/bin/nuxt.js
new file mode 100755
index 0000000000..6496c3d2b2
--- /dev/null
+++ b/distributions/nuxt/bin/nuxt.js
@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+const { name } = require('../package.json')
+const isEdge = name.indexOf('-edge') !== -1
+const cli = require(isEdge ? '@nuxt/cli-edge' : '@nuxt/cli')
+cli.run()
diff --git a/distributions/nuxt/package.json b/distributions/nuxt/package.json
index bdac5b2daa..43c8e30e4a 100644
--- a/distributions/nuxt/package.json
+++ b/distributions/nuxt/package.json
@@ -39,9 +39,11 @@
     }
   ],
   "files": [
+    "bin",
     "dist"
   ],
   "main": "dist/nuxt.js",
+  "bin": "bin/nuxt.js",
   "scripts": {
     "postinstall": "opencollective || exit 0"
   },
diff --git a/packages/cli/bin/nuxt.js b/packages/cli/bin/nuxt-cli.js
similarity index 100%
rename from packages/cli/bin/nuxt.js
rename to packages/cli/bin/nuxt-cli.js
diff --git a/packages/cli/package.json b/packages/cli/package.json
index adc6d86141..0f3bca3762 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -9,7 +9,7 @@
   ],
   "main": "dist/cli.js",
   "bin": {
-    "nuxt": "bin/nuxt.js"
+    "nuxt-cli": "bin/nuxt-cli.js"
   },
   "dependencies": {
     "@nuxt/config": "^2.2.0",
diff --git a/test/unit/cli.test.js b/test/unit/cli.test.js
index defa171d9b..3db88d7511 100644
--- a/test/unit/cli.test.js
+++ b/test/unit/cli.test.js
@@ -8,7 +8,7 @@ const rootDir = resolve(__dirname, '..', 'fixtures/cli')
 
 const url = route => 'http://localhost:' + port + route
 
-const nuxtBin = resolve(__dirname, '../../packages/cli/bin/nuxt.js')
+const nuxtBin = resolve(__dirname, '../../packages/cli/bin/nuxt-cli.js')
 const spawnNuxt = (command, opts) => spawn(nuxtBin, [command, rootDir], opts)
 
 const close = async (nuxtInt) => {