diff --git a/docs/head.html b/docs/head.html
index c9ecfdd3..aa971cc3 100644
--- a/docs/head.html
+++ b/docs/head.html
@@ -8,7 +8,7 @@
 	<meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1"/>
 	<title>Strand Web Components</title>
 	<script language="javascript" src="bower_components/webcomponentsjs/webcomponents.min.js"></script>
-	<link rel="import" href="strand.html"/>
+	<link rel="import" href="bower_components/strand/dist/strand.html"/>
 	<script language="javascript" src="//cdnjs.cloudflare.com/ajax/libs/ace/1.1.3/ace.js"></script>
 	<script language="javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.1/jquery.js"></script>
 	<script language="javascript" src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.6.0/underscore-min.js"></script>
diff --git a/grunt/tasks/build.js b/grunt/tasks/build.js
index dd331cd8..84ff89ee 100644
--- a/grunt/tasks/build.js
+++ b/grunt/tasks/build.js
@@ -153,6 +153,11 @@ module.exports = function(grunt) {
 				}]
 			},
 			dist:{
+				options:{
+					excludes: {
+						imports: ['polymer.html']
+					}
+				},
 				files: {
 					'<%= build_dir %>/<%= pkg.name %>.html' : '<%= build_dir %>/<%= pkg.name %>.html'
 				}
diff --git a/grunt/tasks/docs.js b/grunt/tasks/docs.js
index c7631d72..aeb05adc 100644
--- a/grunt/tasks/docs.js
+++ b/grunt/tasks/docs.js
@@ -157,9 +157,9 @@ module.exports = function(grunt) {
 	grunt.config('copy.docs', {
 		files: [ 
 			{ expand: true, cwd: 'docs', src: 'images/**', dest: '<%= build_dir %>/docs/'},
-			{ src: 'bower_components/webcomponentsjs/webcomponents.min.js', dest: '<%= build_dir %>/docs/bower_components/webcomponentsjs/webcomponents.min.js'},
-			{ src: 'LICENSE.txt', dest: '<%= build_dir %>/docs/LICENSE.txt' },
-			{ src: '<%= build_dir %>/<%= pkg.name %>.html', dest: '<%= build_dir %>/docs/<%= pkg.name %>.html' }
+			{ expand: true, src: ['bower_components/webcomponentsjs/webcomponents.min.js', 'bower_components/polymer/polymer.html'], dest: '<%= build_dir %>/docs/'},
+			{ src: 'LICENSE.txt', dest: '<%= build_dir %>/docs/' },
+			{ src: '<%= dist_dir %>/<%= pkg.name %>.html', dest: '<%= build_dir %>/docs/bower_components/strand/dist/<%= pkg.name %>.html' }
 		]
 	});