diff --git a/bin/aiur b/bin/aiur
index ed3d884..8f41efc 100755
--- a/bin/aiur
+++ b/bin/aiur
@@ -3,6 +3,13 @@
 
 let faucet = require("faucet-pipeline-core");
 let parseCLI = require("../lib/cli");
+let server = require("../lib/server");
 
 let { referenceDir, config, options } = parseCLI();
+let liveserve = options.liveserve;
+
+// We want to use our own live-server implementation instead of faucet
+delete options.liveserve;
 faucet(referenceDir, config, options);
+
+server.live(liveserve, config.manifest.webRoot);
diff --git a/lib/server.js b/lib/server.js
new file mode 100644
index 0000000..5811b5d
--- /dev/null
+++ b/lib/server.js
@@ -0,0 +1,8 @@
+let { _parseHost } = require("faucet-pipeline-core/lib/server");
+
+exports.live = (config, root) => {
+	let LiveServer = require("five-server").default;
+	let [host, port] = _parseHost(config);
+
+	new LiveServer().start({ port, host, root, open: false });
+};
diff --git a/lib/style.scss b/lib/style.scss
index 557cabb..1a90cb6 100644
--- a/lib/style.scss
+++ b/lib/style.scss
@@ -294,3 +294,8 @@ resize-handle {
 		display: block;
 	}
 }
+
+/* disable five-server toast messages on page reload */
+#fiveserver-info-wrapper {
+	visibility: hidden;
+}
diff --git a/package.json b/package.json
index f459fcb..427962f 100644
--- a/package.json
+++ b/package.json
@@ -26,8 +26,8 @@
 		"faucet-pipeline-jsx": "^2.1.7",
 		"faucet-pipeline-sass": "^1.6.0",
 		"faucet-pipeline-static": "^1.2.0",
+		"five-server": "^0.0.26",
 		"handlebars": "^4.7.7",
-		"live-server": "^1.2.1",
 		"metacolon": "^1.1.0",
 		"minimist": "^1.2.5",
 		"mkdirp": "^1.0.4",