diff --git a/gulpfile.js b/gulpfile.js
index 0e91aaf014..07b0e0426a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -183,7 +183,7 @@ function delRev(dest, manifestName) {
   });
 }
 
-gulp.task('serve', function(cb) {
+gulp.task('serve', ['build-manifest'], function(cb) {
   var called = false;
   nodemon({
     script: paths.server,
@@ -481,7 +481,7 @@ function buildManifest() {
     .pipe(gulp.dest('server/'));
 }
 
-var buildDependents = ['less', 'js', 'dependents'];
+var buildDependents = ['less', 'js', 'dependents', 'pack-watch-manifest'];
 
 gulp.task('build-manifest', buildDependents, function() {
   return buildManifest();
@@ -505,9 +505,9 @@ var watchDependents = [
   'dependents',
   'serve',
   'sync',
-  'build-manifest',
   'pack-watch',
-  'pack-watch-manifest'
+  'pack-watch-manifest',
+  'build-manifest'
 ];
 
 gulp.task('reload', function() {
@@ -533,6 +533,7 @@ gulp.task('default', [
   'serve',
   'pack-watch',
   'pack-watch-manifest',
+  'build-manifest-watch',
   'watch',
   'sync'
 ]);