diff --git a/packages/@angular/cli/bin/ng b/packages/@angular/cli/bin/ng
index 029c758c8c..e396458cbd 100755
--- a/packages/@angular/cli/bin/ng
+++ b/packages/@angular/cli/bin/ng
@@ -8,6 +8,7 @@ const CliConfig = require('../models/config').CliConfig;
 const Version = require('../upgrade/version').Version;
 
 const fs = require('fs');
+const findUp = require('../utilities/find-up').findUp;
 const packageJson = require('../package.json');
 const path = require('path');
 const resolve = require('resolve');
@@ -87,6 +88,32 @@ if (require('../package.json')['name'] == 'angular-cli'
   `));
 }
 
+const packageJsonProjectPath = findUp('package.json', process.cwd(), true);
+if (packageJsonProjectPath && fs.existsSync(packageJsonProjectPath)) {
+  const packageJsonProject = require(packageJsonProjectPath);
+  const hasOldDep = !!packageJsonProject.dependencies['angular-cli'];
+  const hasOldDevDep = !!packageJsonProject.devDependencies['angular-cli'];
+  const hasDevDep = !!packageJsonProject.devDependencies['@angular/cli'];
+
+  if (hasOldDep || hasOldDevDep || !hasDevDep) {
+    const warnings = [
+      'The package "angular-cli" has been renamed to "@angular/cli". The old package will be '
+      + 'deprecated soon.',
+      '',
+      'Please take the following steps to avoid issues:'
+    ];
+    if (hasOldDep) {
+      warnings.push('"npm uninstall --save angular-cli"');
+    }
+    if (hasOldDevDep) {
+      warnings.push('"npm uninstall --save-dev angular-cli"');
+    }
+    if (!hasDevDep) {
+      warnings.push('"npm install --save-dev @angular/cli@latest"');
+    }
+    process.stderr.write(yellow(warnings.join('\n'), '\n\n'));
+  }
+}
 
 resolve('@angular/cli', { basedir: process.cwd() },
   function (error, projectLocalCli) {