diff --git a/gulp/build.js b/gulp/build.js
index f48b0f0..711a95e 100644
--- a/gulp/build.js
+++ b/gulp/build.js
@@ -3,6 +3,7 @@
 var path = require('path');
 var gulp = require('gulp');
 var rename = require('gulp-rename');
+var merge = require('merge-stream');
 var conf = require('./conf');
 
 var noosferoThemePrefix = path.join("/designs/themes/angular-theme", conf.paths.dist, '/');
@@ -120,13 +121,14 @@ gulp.task('clean-docs', [], function() {
 });
 
 gulp.task('noosfero', ['html'], function () {
-    gulp.src('layouts/**/*')
+    var layouts = gulp.src('layouts/**/*')
       .pipe(gulp.dest(path.join(conf.paths.dist, "layouts")));
-    gulp.src('theme.yml')
+    var theme = gulp.src('theme.yml')
       .pipe(gulp.dest(conf.paths.dist));
-    return gulp.src(path.join(conf.paths.dist, 'index.html'))
+    var index = gulp.src(path.join(conf.paths.dist, 'index.html'))
       .pipe(rename('index.html.erb'))
       .pipe(gulp.dest(conf.paths.dist));
+    return merge(layouts, theme, index);
 });
 
 gulp.task('build', ['html', 'fonts', 'other', 'locale', 'noosfero']);
diff --git a/package.json b/package.json
index 88a0cd4..d6157b3 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "estraverse": "~4.1.0",
     "expose-loader": "^0.7.1",
     "glob": "^7.0.0",
-    "gulp": "~3.9.0",
+    "gulp": "^3.9.1",
     "gulp-angular-filesort": "~1.1.1",
     "gulp-angular-templatecache": "~1.8.0",
     "gulp-autoprefixer": "~3.0.2",
@@ -79,6 +79,7 @@
     "karma-webpack": "^1.7.0",
     "lodash": "~3.10.1",
     "main-bower-files": "~2.9.0",
+    "merge-stream": "^1.0.0",
     "on-build-webpack": "^0.1.0",
     "phantomjs": "~1.9.18",
     "phantomjs-polyfill": "0.0.2",
--
libgit2 0.21.2