diff --git a/package.json b/package.json
index 0687e43a78..c4c4b8e1e6 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "cpr": "2.0.0",
     "del": "2.2.2",
     "dgeni": "0.4.2",
-    "dgeni-packages": "0.16.0",
+    "dgeni-packages": "^0.10.18",
     "event-stream": "3.3.4",
     "file-loader": "0.9.0",
     "glob": "7.0.6",
diff --git a/scripts/gulp/tasks/demos.ts b/scripts/gulp/tasks/demos.ts
index edea1f081b..0f2ea035b3 100644
--- a/scripts/gulp/tasks/demos.ts
+++ b/scripts/gulp/tasks/demos.ts
@@ -115,8 +115,6 @@ function buildDemos(done: Function) {
     return compileTests();
   }).then(() => {
     return rollupTests();
-  }).then(() => {
-    return generatePolyfills();
   }).then(() => {
     done();
   }).catch(err => {
@@ -136,7 +134,7 @@ function cleanDemos(done: Function) {
     ], done);
 }
 
-task('demos.build', ['demos.sass', 'demos.fonts'], (done: Function) => {
+task('demos.build', ['demos.sass', 'demos.fonts', 'demos.polyfills'], (done: Function) => {
   buildDemos(done);
 });
 
@@ -154,3 +152,11 @@ task('demos.sass', () => {
 task('demos.fonts', () => {
   return copyFonts(`${DEMOS_ROOT}/fonts`);
 });
+
+task('demos.polyfills', (done: Function) => {
+  generatePolyfills().then(() => {
+    done();
+  }).catch(err => {
+    done(err);
+  });
+});
diff --git a/scripts/gulp/tasks/docs.ts b/scripts/gulp/tasks/docs.ts
index a9934a4c16..9480c42ee7 100644
--- a/scripts/gulp/tasks/docs.ts
+++ b/scripts/gulp/tasks/docs.ts
@@ -31,7 +31,7 @@ task('docs', () => {
 
 task('docs.copyDemos', [], (done: Function) => {
   const config = require('../../config.json');
-  const outputDir = join(config.docsDest, 'dist', 'demos');
+  const outputDir = join(config.docsDest, 'demos');
   let promises = [];
   promises.push(copyDemoCss(join(outputDir, 'css')));
   promises.push(copyDemoFonts(join(outputDir, 'fonts')));