diff --git a/breaking-changes.md b/breaking-changes.md
new file mode 100644
index 0000000000..088909adcd
--- /dev/null
+++ b/breaking-changes.md
@@ -0,0 +1,10 @@
+# Breaking Changes
+
+## 0.14
+
+- D2530161: Need to introduce rn-cli.config.js for existing projects
+- D2533877: `react-native bundle` API changes:
+  - API is now `entry-file <path>` based instead of url based.
+  - Need to specify which platform you're bundling for `--platform <ios|android>`.
+  - Option `--out` has been renamed for `--bundle-output`.
+  - Source maps are no longer automatically generated. Need to specify `--sourcemap-output <path>` option to indicate where to put the source maps.
diff --git a/breaking-changes.txt b/breaking-changes.txt
deleted file mode 100644
index fcd61fe410..0000000000
--- a/breaking-changes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-0.14:
-- D2530161: Need to introduce rn-cli.config.js for existing projects
-
diff --git a/cli.js b/cli.js
index f683f9dfed..13b3ce7e0f 100644
--- a/cli.js
+++ b/cli.js
@@ -1,4 +1,4 @@
- /**
+/**
  * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
@@ -8,4 +8,8 @@
  */
 'use strict';
 
+require('./packager/babelRegisterOnly')([
+  /private-cli\/src/
+]);
+
 module.exports = require('./local-cli/cli.js');
diff --git a/local-cli/cli.js b/local-cli/cli.js
index c906b7d579..7258be6edf 100644
--- a/local-cli/cli.js
+++ b/local-cli/cli.js
@@ -4,13 +4,13 @@
 
 'use strict';
 
+var bundle = require('../private-cli/src/bundle/bundle');
+var bundle_DEPRECATED = require('./bundle.js');
+var Config = require('../private-cli/src/util/Config');
 var fs = require('fs');
-var spawn = require('child_process').spawn;
-var path = require('path');
 var generateAndroid = require('./generate-android.js');
 var init = require('./init.js');
 var install = require('./install.js');
-var bundle = require('./bundle.js');
 var newLibrary = require('./new-library.js');
 var runAndroid = require('./run-android.js');
 var runPackager = require('./run-packager.js');
@@ -51,7 +51,8 @@ function run() {
     install.init();
     break;
   case 'bundle':
-    bundle.init(args);
+    bundle(args, Config.get(__dirname)).done();
+    // bundle_DEPRECATED.init(args);
     break;
   case 'new-library':
     newLibrary.init(args);
diff --git a/local-cli/generator/templates/rn-cli.config.js b/local-cli/generator/templates/rn-cli.config.js
index 65ce495479..b3aebb7bdc 100644
--- a/local-cli/generator/templates/rn-cli.config.js
+++ b/local-cli/generator/templates/rn-cli.config.js
@@ -4,23 +4,20 @@ var blacklist = require('./node_modules/react-native/packager/blacklist');
 
 var config = {
   getProjectRoots() {
-    return this._getRoots();
+    return [__dirname];
   },
 
   getAssetRoots() {
-    return this._getRoots();
+    // speficy where to look for assets
+    return [];
   },
 
-  getBlacklistRE() {
-    return blacklist('');
+  getBlacklistRE(platform) {
+    return blacklist(platform);
   },
 
   getTransformModulePath() {
     return require.resolve('./node_modules/react-native/packager/transformer');
-  },
-
-  _getRoots() {
-    return [__dirname];
   }
 };
 
diff --git a/private-cli/src/bundle/bundle.js b/private-cli/src/bundle/bundle.js
index f66bda2b5a..0ee55347ca 100644
--- a/private-cli/src/bundle/bundle.js
+++ b/private-cli/src/bundle/bundle.js
@@ -63,7 +63,7 @@ function _bundle(argv, config, resolve, reject) {
   const options = {
     projectRoots: config.getProjectRoots(),
     assetRoots: config.getAssetRoots(),
-    blacklistRE: config.getBlacklistRE(),
+    blacklistRE: config.getBlacklistRE(args.platform),
     transformModulePath: config.getTransformModulePath(),
   };
 
diff --git a/private-cli/src/dependencies/dependencies.js b/private-cli/src/dependencies/dependencies.js
index 09410d0e8b..0a90d44e2c 100644
--- a/private-cli/src/dependencies/dependencies.js
+++ b/private-cli/src/dependencies/dependencies.js
@@ -50,7 +50,7 @@ function _dependencies(argv, config, resolve, reject) {
   const packageOpts = {
     projectRoots: config.getProjectRoots(),
     assetRoots: config.getAssetRoots(),
-    blacklistRE: config.getBlacklistRE(),
+    blacklistRE: config.getBlacklistRE(args.platform),
     transformModulePath: config.getTransformModulePath(),
   };