diff --git a/cmd/stepd/handler.go b/cmd/stepd/handler.go
index a1e2fcb..a2db3d0 100644
--- a/cmd/stepd/handler.go
+++ b/cmd/stepd/handler.go
@@ -81,9 +81,8 @@ func (this *handler) serveFile (res http.ResponseWriter, req *http.Request, file
 		this.serveError(res, req, http.StatusInternalServerError, err)
 		return
 	}
-	if document.ContentType != "" {
-		log.Println(document.ContentType)
-		res.Header().Set("Content-Type", document.ContentType)
+	if contentType, ok := document.FrontMatter["content-type"]; ok {
+		res.Header().Set("Content-Type", contentType)
 	}
 	data := step.HTTPData { }
 	data.Res.Header      = make(http.Header)