diff --git a/bower.json b/bower.json
index a85ef26a..02166d26 100644
--- a/bower.json
+++ b/bower.json
@@ -15,7 +15,7 @@
     "tests"
   ],
   "dependencies": {
-    "ember": "^2.12.0"
+    "ember": "^2.13.0"
   },
   "devDependencies": {
     "qunit": "^2.0.1",
@@ -23,5 +23,8 @@
     "ember-cli-test-loader": "0.0.4",
     "jquery": "~2.1.4",
     "ember-data": "~2.12.1"
+  },
+  "resolutions": {
+    "ember-cli-shims": "^1.1.0"
   }
 }
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 63ffd806..21e479d2 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -99,7 +99,7 @@ module.exports = function() {
     inputFiles: [
       'jquery/dist/jquery.js',
       'ember/ember-template-compiler.js',
-      'ember/ember.js',
+      'ember/ember.debug.js',
       'ember-data/ember-data.js'
     ],
     outputFile: '/assets/vendor.js'