diff --git a/bld.sh b/bld.sh
index 55afc03a9..1065361f1 100755
--- a/bld.sh
+++ b/bld.sh
@@ -16,6 +16,7 @@ node ../core/boot.js \
 	--savetiddler ReadMe ../readme.md text/html \
 	--savetiddler $:/core/tiddlywiki5.template.html ../tmp/tw5/index.html text/plain \
 	--savetiddler $:/core/static.template.html ../tmp/tw5/static.html text/plain \
+	--server \
 	|| exit 1
 
 popd > /dev/null
diff --git a/core/modules/commands/server.js b/core/modules/commands/server.js
new file mode 100644
index 000000000..53df9db24
--- /dev/null
+++ b/core/modules/commands/server.js
@@ -0,0 +1,90 @@
+/*\
+title: $:/core/modules/commands/server.js
+type: application/javascript
+module-type: command
+
+Serve tiddlers over http. The server is very simple. At the root, it serves a rendering of a specified tiddler. Otherwise, it serves individual tiddlers encoded in JSON, and supports the basic HTTP operations for GET, PUT and DELETE.
+
+For example:
+
+	--server 8080 $:/core/tiddlywiki5.template.html text/plain text/html
+
+The parameters are:
+
+	--server <port> <roottiddler> <rendertype> <servetype>
+
+* ''port'' - port number to serve from (defaults to "8080")
+* ''roottiddler'' - the tiddler to serve at the root (defaults to "$:/core/tiddlywiki5.template.html") 
+* ''rendertype'' - the content type to which the root tiddler should be rendered (defaults to "text/plain")
+* ''servetype'' - the content type with which the root tiddler should be served (defaults to "text/html")
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.info = {
+	name: "server",
+	synchronous: true
+};
+
+var Command = function(params,commander,callback) {
+	this.params = params;
+	this.commander = commander;
+	this.callback = callback;
+};
+
+Command.prototype.execute = function() {
+	var self = this,
+		util = require("util"),
+		fs = require("fs"),
+		url = require("url"),
+		path = require("path"),
+		http = require("http"),
+		port = this.params[0] || "8080",
+		rootTiddler = this.params[1] || "$:/core/tiddlywiki5.template.html",
+		renderType = this.params[2] || "text/plain",
+		serveType = this.params[3] || "text/html";
+	http.createServer(function(request, response) {
+		var path = url.parse(request.url).pathname;
+		switch(request.method) {
+			case "PUT":
+				var data = "";
+				request.on("data",function(chunk) {
+					data += chunk.toString();
+				});
+				request.on("end",function() {
+					var title = decodeURIComponent(path.substr(1));
+					self.commander.wiki.addTiddler(new $tw.Tiddler(JSON.parse(data),{title: title}));
+					response.writeHead(204, "OK");
+					response.end();
+				});
+				break;
+			case "DELETE":
+				self.commander.wiki.deleteTiddler(decodeURIComponent(path.substr(1)));
+				response.writeHead(204, "OK");
+				response.end();
+				break;
+			case "GET":
+				if(path === "/") {
+					response.writeHead(200, {"Content-Type": serveType});
+					var text = self.commander.wiki.renderTiddler(renderType,rootTiddler);
+					response.end(text, "utf8");	
+				} else {
+					response.writeHead(404);
+					response.end();
+				}
+				break;
+			}
+	}).listen(port);
+	if(this.commander.verbose) {
+		console.log("Serving on port " + port);
+	}
+	return null;
+};
+
+exports.Command = Command;
+
+})();