diff --git a/blueprints/@glimmer/blueprint/index.js b/blueprints/@glimmer/blueprint/index.js
new file mode 100644
index 0000000..e71d1ed
--- /dev/null
+++ b/blueprints/@glimmer/blueprint/index.js
@@ -0,0 +1,26 @@
+'use strict';
+const path = require('path');
+const MainBlueprint = require('../../../index');
+
+/*
+  Create an "addon blueprint" that simply defers to our
+  top level entry point as the blueprint.
+
+  This is basically just a work around for
+  https://github.com/ember-cli/ember-cli/issues/6952.
+
+  Once that issue is fixed and released we can remove:
+
+    * ember-addon keyword in package.json
+    * ember-addon key in package.json
+    * ember-addon-main.js file
+    * blueprints/ folder
+ */
+module.exports = Object.assign({}, MainBlueprint, {
+  init() {
+    this._super.init.apply(this, arguments);
+
+    this.path = path.join(__dirname, '..', '..', '..');
+    this.name = '@glimmer/blueprint';
+  }
+});
diff --git a/ember-addon-main.js b/ember-addon-main.js
new file mode 100644
index 0000000..67814ba
--- /dev/null
+++ b/ember-addon-main.js
@@ -0,0 +1,19 @@
+'use strict';
+
+/*
+  Create an "addon blueprint" that simply defers to our
+  top level entry point as the blueprint.
+
+  This is basically just a work around for
+  https://github.com/ember-cli/ember-cli/issues/6952.
+
+  Once that issue is fixed and released we can remove:
+
+  * ember-addon keyword in package.json
+  * ember-addon key in package.json
+  * ember-addon-main.js file
+  * blueprints/ folder
+  */
+module.exports = {
+  name: '@glimmer/blueprint'
+};
diff --git a/files/package.json b/files/package.json
index c188603..83e0178 100644
--- a/files/package.json
+++ b/files/package.json
@@ -14,6 +14,7 @@
   "devDependencies": {
     "@glimmer/application": "^0.4.0",
     "@glimmer/application-pipeline": "^0.5.2",
+    "@glimmer/blueprint": "^0.1.12",
     "@glimmer/component": "^0.3.8",
     "@glimmer/resolver": "^0.3.0",
     "ember-cli": "github:ember-cli/ember-cli",
diff --git a/package.json b/package.json
index 86d42b3..6f8168b 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
     "url": "git+https://github.com/glimmerjs/glimmer-blueprint.git"
   },
   "keywords": [
-    "ember-blueprint"
+    "ember-blueprint",
+    "ember-addon"
   ],
   "author": "Tom Dale <tom@tomdale.net>",
   "license": "MIT",
@@ -24,5 +25,8 @@
   },
   "devDependencies": {
     "ember-cli-valid-component-name": "^1.0.0"
+  },
+  "ember-addon": {
+    "main": "ember-addon-main.js"
   }
 }