diff --git a/gulpfile.coffee b/gulpfile.coffee
index 604bbb8..23f45d6 100644
--- a/gulpfile.coffee
+++ b/gulpfile.coffee
@@ -11,7 +11,7 @@ streamify  = require 'gulp-streamify'
 rename     = require 'gulp-rename'
 uglify     = require 'gulp-uglify'
 coffeeify  = require 'coffeeify'
-nodeStatic = require 'node-static'
+ecstatic   = require 'ecstatic'
 lr         = require 'tiny-lr'
 livereload = require 'gulp-livereload'
 plumber    = require 'gulp-plumber'
@@ -83,13 +83,10 @@ gulp.task 'assets', ->
     .src paths.assets.source
     .pipe gulp.dest paths.assets.destination
 
-gulp.task "server", ->
-  staticFiles = new nodeStatic.Server './public'
-  require('http').createServer (req, res) ->
-    req.addListener 'end', ->
-      staticFiles.serve req, res
-    req.resume()
-  .listen 9001
+gulp.task 'server', ->
+  require('http')
+    .createServer ecstatic root: __dirname + '/public'
+    .listen 9001
 
 gulp.task "watch", ->
   reloadServer.listen 35729
diff --git a/package.json b/package.json
index 5ddc190..7a52969 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "gulp-util": "~2.2.9",
     "gulp-stylus": "0.0.9",
     "gulp-jade": "~0.3.0",
-    "node-static": "~0.7.3",
     "gulp-minify-css": "~0.2.0",
     "tiny-lr": "0.0.5",
     "gulp-livereload": "~0.2.0",
@@ -35,7 +34,8 @@
     "vinyl-source-stream": "~0.1.1",
     "coffeeify": "~0.6.0",
     "gulp": "~3.6.0",
-    "watchify": "~0.6.3"
+    "watchify": "~0.6.3",
+    "ecstatic": "~0.5.1"
   },
   "browser": {},
   "browserify-shim": {},