diff --git a/cmd/stepd/main.go b/cmd/stepd/main.go
index 22f75b8..bb2acf2 100644
--- a/cmd/stepd/main.go
+++ b/cmd/stepd/main.go
@@ -21,6 +21,10 @@ func main () {
 		'a', "address",
 		"The address to host the server on",
 		":8080", cli.ValString)
+	flagErrorDocument := cli.NewInputFlag (
+		0, "error-document",
+		"The document to use for displaying errors",
+		"", cli.ValString)
 	flagDirectories := cli.NewFlag (
 		'd', "directories",
 		"Serve the contents of directories")
@@ -47,10 +51,11 @@ func main () {
 
 	// set up the HTTP handler
 	handler := stephttp.Handler {
-		Environment: &environment,
-		Directories: flagDirectories.Value == "true",
-		StepExt:     ucontainer.NewSet(".step"),
-		Index:       []string { "index.step", "index.html", "index" },
+		Environment:   &environment,
+		Directories:   flagDirectories.Value == "true",
+		StepExt:       ucontainer.NewSet(".step"),
+		Index:         []string { "index.step", "index.html", "index" },
+		ErrorDocument: flagErrorDocument.Value,
 	}
 
 	// set up the HTTP server