diff --git a/.npmignore b/.npmignore
index 4a0e13d6067..4c46690a01b 100644
--- a/.npmignore
+++ b/.npmignore
@@ -25,5 +25,4 @@ testem.js
 *.gemspec
 **/*.rb
 node-tests/
-lib/yuidoc.js
 lib/version-replace.js
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 432afc11cd1..b50c370c723 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -1,8 +1,6 @@
 'use strict';
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
-const merge = require('broccoli-merge-trees');
-const yuidoc = require('./lib/yuidoc');
 
 module.exports = function(defaults) {
   let app = new EmberAddon(defaults, {});
@@ -14,11 +12,5 @@ module.exports = function(defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  let appTree = app.toTree();
-
-  if (process.env.EMBER_ENV === 'production') {
-    return merge([appTree, yuidoc()]);
-  } else {
-    return appTree;
-  }
+  return app.toTree();
 };
diff --git a/lib/yuidoc.js b/lib/yuidoc.js
deleted file mode 100644
index 7b560eb2ee5..00000000000
--- a/lib/yuidoc.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var YUIDoc = require('broccoli-yuidoc');
-var calculateVersion = require('./calculate-version');
-
-module.exports = function yui() {
-  return new YUIDoc(['addon', 'node_modules/ember-inflector/addon'], {
-    destDir: 'docs',
-    yuidoc: {
-      name: 'The ember-data API',
-      description: 'The ember-data API: a data persistence library for Ember.js',
-      version: calculateVersion(),
-      logo: 'http://f.cl.ly/items/1A1L432s022u1O1q1V3p/ember%20logo.png',
-      url: 'https://github.com/emberjs/data',
-      options: {
-        exclude: 'vendor',
-        outdir: 'docs/build',
-      },
-    },
-  });
-};
diff --git a/package.json b/package.json
index c98a90c584f..29a81056319 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,6 @@
     "broccoli-string-replace": "^0.1.1",
     "broccoli-test-helper": "^1.2.0",
     "broccoli-uglify-sourcemap": "^1.0.1",
-    "broccoli-yuidoc": "^3.0.0",
     "co": "^4.6.0",
     "common-tags": "^1.4.0",
     "ember-cli": "^3.1.4",
@@ -91,6 +90,7 @@
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^2.2.0",
     "ember-cli-uglify": "2.0.0-beta.1",
+    "ember-cli-yuidoc": "^0.8.8",
     "ember-decorators": "^2.1.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-disable-proxy-controllers": "^1.0.1",
diff --git a/yarn.lock b/yarn.lock
index 8b6ee9d51aa..5f53f6e0be6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1421,6 +1421,19 @@ broccoli-caching-writer@^3.0.3:
     rsvp "^3.0.17"
     walk-sync "^0.3.0"
 
+broccoli-caching-writer@~2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.0.4.tgz#d995d7d1977292e498f78df05887230fcb4a5e2c"
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.2.5"
+    broccoli-plugin "1.1.0"
+    debug "^2.1.1"
+    lodash-node "^3.2.0"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.2.0"
+
 broccoli-clean-css@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa"
@@ -1561,7 +1574,7 @@ broccoli-lint-eslint@^4.2.1:
     lodash.defaultsdeep "^4.6.0"
     md5-hex "^2.0.0"
 
-broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.2.1:
+broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.2.1:
   version "1.2.4"
   resolved "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
   dependencies:
@@ -1735,16 +1748,6 @@ broccoli-uglify-sourcemap@^2.0.0-beta.1:
     walk-sync "^0.3.2"
     workerpool "^2.3.0"
 
-broccoli-yuidoc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/broccoli-yuidoc/-/broccoli-yuidoc-3.0.0.tgz#e436588ddfb6ae81ce82d87e894333d0fdd10487"
-  dependencies:
-    broccoli-caching-writer "^3.0.3"
-    broccoli-merge-trees "^2.0.0"
-    merge "~1.2.0"
-    rsvp "^3.5.0"
-    yuidocjs "^0.10.2"
-
 broccoli@^1.1.0:
   version "1.1.4"
   resolved "https://registry.npmjs.org/broccoli/-/broccoli-1.1.4.tgz#b023b028b866f447ed14341007961efd03f7251c"
@@ -2874,6 +2877,16 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0, ember-cli-ve
     resolve "^1.3.3"
     semver "^5.3.0"
 
+ember-cli-yuidoc@^0.8.8:
+  version "0.8.8"
+  resolved "https://registry.yarnpkg.com/ember-cli-yuidoc/-/ember-cli-yuidoc-0.8.8.tgz#3858baaf85388a976024f9de40f1075fea58f606"
+  dependencies:
+    broccoli-caching-writer "~2.0.4"
+    broccoli-merge-trees "^1.1.1"
+    git-repo-version "0.2.0"
+    rsvp "3.0.14"
+    yuidocjs "^0.10.0"
+
 ember-cli@^3.1.4:
   version "3.1.4"
   resolved "https://registry.npmjs.org/ember-cli/-/ember-cli-3.1.4.tgz#95f7ff4302d535619b5d5ff1c7040877a67d4468"
@@ -4033,10 +4046,16 @@ get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
 
-git-repo-info@^1.1.2, git-repo-info@^1.4.1:
+git-repo-info@^1.0.4, git-repo-info@^1.1.2, git-repo-info@^1.4.1:
   version "1.4.1"
   resolved "https://registry.npmjs.org/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943"
 
+git-repo-version@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/git-repo-version/-/git-repo-version-0.2.0.tgz#9a1d0019a50fc9e623c43d1c0fcc437391207d0d"
+  dependencies:
+    git-repo-info "^1.0.4"
+
 git-repo-version@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/git-repo-version/-/git-repo-version-1.0.2.tgz#2c8e9bee5d970cafc0dd58480f9dc56d9afe8e4f"
@@ -5030,6 +5049,10 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
+lodash-node@^3.2.0:
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/lodash-node/-/lodash-node-3.10.2.tgz#2598d5b1b54e6a68b4cb544e5c730953cbf632f7"
+
 lodash._baseassign@^3.0.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
@@ -5533,7 +5556,7 @@ merge-trees@^1.0.1:
     rimraf "^2.4.3"
     symlink-or-copy "^1.0.0"
 
-merge@^1.1.3, merge@^1.2.0, merge@~1.2.0:
+merge@^1.1.3, merge@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
 
@@ -6732,6 +6755,10 @@ route-recognizer@^0.3.3:
   version "0.3.3"
   resolved "https://registry.npmjs.org/route-recognizer/-/route-recognizer-0.3.3.tgz#1d365e27fa6995e091675f7dc940a8c00353bd29"
 
+rsvp@3.0.14:
+  version "3.0.14"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.14.tgz#9d2968cf36d878d3bb9a9a5a4b8e1ff55a76dd31"
+
 rsvp@4.8.0:
   version "4.8.0"
   resolved "https://registry.npmjs.org/rsvp/-/rsvp-4.8.0.tgz#dc1dc400e2d48bcf3b1991f2a3b714f038fc432e"
@@ -7821,7 +7848,7 @@ walk-sync@^0.1.3:
   version "0.1.3"
   resolved "https://registry.npmjs.org/walk-sync/-/walk-sync-0.1.3.tgz#8a07261a00bda6cfb1be25e9f100fad57546f583"
 
-walk-sync@^0.2.5, walk-sync@^0.2.7:
+walk-sync@^0.2.0, walk-sync@^0.2.5, walk-sync@^0.2.7:
   version "0.2.7"
   resolved "https://registry.npmjs.org/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969"
   dependencies:
@@ -8043,7 +8070,7 @@ yui@^3.18.1:
   dependencies:
     request "~2.40.0"
 
-yuidocjs@^0.10.2:
+yuidocjs@^0.10.0:
   version "0.10.2"
   resolved "https://registry.npmjs.org/yuidocjs/-/yuidocjs-0.10.2.tgz#33924967ce619024cd70ef694e267d2f988f73f6"
   dependencies:
diff --git a/yuidoc.json b/yuidoc.json
new file mode 100644
index 00000000000..c77156e0d5a
--- /dev/null
+++ b/yuidoc.json
@@ -0,0 +1,15 @@
+{
+  "name": "The ember-data API",
+  "description": "The ember-data API: a data persistence library for Ember.js",
+  "url": "https://github.com/emberjs/data",
+  "options": {
+    "enabledEnvironments": ["production"],
+    "extension": ".js,.ts",
+    "paths": [
+      "addon",
+      "node_modules/ember-inflector/addon"
+    ],
+    "exclude": "vendor",
+    "outdir": "docs"
+  }
+}