diff --git a/Makefile b/Makefile
index 74886ded4..835c16f79 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ ESLINT=./node_modules/.bin/eslint
 NODE=node
 TAP=./node_modules/.bin/tap
 WEBPACK=./node_modules/.bin/webpack --progress --colors
+WEBPACK_DEV_SERVER=./node_modules/.bin/webpack-dev-server
 
 # ------------------------------------------------------------------------------
 
@@ -11,6 +12,9 @@ build:
 watch:
 	$(WEBPACK) --watch
 
+serve:
+	$(WEBPACK_DEV_SERVER) --content-base ./
+
 # ------------------------------------------------------------------------------
 
 lint:
diff --git a/package.json b/package.json
index fdcb4bc84..4639595e3 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "json-loader": "0.5.4",
     "scratch-blocks": "git+https://git@github.com/LLK/scratch-blocks.git",
     "tap": "5.7.1",
-    "webpack": "1.13.0"
+    "webpack": "1.13.0",
+    "webpack-dev-server": "^1.14.1"
   }
 }