diff --git a/core/modules/commands/server.js b/core/modules/commands/server.js
index 24f94de65..5023f9774 100644
--- a/core/modules/commands/server.js
+++ b/core/modules/commands/server.js
@@ -197,6 +197,15 @@ var Command = function(params,commander,callback) {
 			response.end(text,"utf8");
 		}
 	});
+	this.server.addRoute({
+		method: "GET",
+		path: /^\/favicon.ico$/,
+		handler: function(request,response,state) {
+			response.writeHead(200, {"Content-Type": "image/x-icon"});
+			var buffer = state.wiki.getTiddlerText("$:/favicon.ico","");
+			response.end(buffer,"base64");
+		}
+	});
 	this.server.addRoute({
 		method: "GET",
 		path: /^\/recipes\/default\/tiddlers.json$/,