     .pipe gulp.dest 'dist/images'
 
 gulp.task 'fonts', ->
+  gulp.src '.tmp/fonts/**/*'
+    .pipe gulp.dest 'dist/fonts'
+
+gulp.task 'wireFonts', ->
   # Copy font files obtained with bower
   bowerFiles = require 'main-bower-files'
 
   gulp.src bowerFiles({filter: '**/*.{eot,svg,ttf,woff,woff2}'
   }).concat 'app/fonts/**/*'
     .pipe gulp.dest '.tmp/fonts'
-    .pipe gulp.dest 'dist/fonts'
 
 gulp.task 'extras', ->
   # Copy all files not handled by jekyll or other gulp tasks


gulp.task 'serve', ['clean'], ->
  # Clean first, then the rest
  runSequence ['jekyll:tmp', 'fonts'], 'browsersync'

gulp.task 'browsersync', ->
  # Run the web server

# Basic entry point
gulp.task 'build', ['clean'], ->
  # Clean first, then the rest
  runSequence ['jekyll', 'wireFonts', 'extras'],
    'assets',
    ['cleanStray', 'size']

gulp.task 'size', ->
