diff --git a/lib/chibi/mime.scm b/lib/chibi/mime.scm
index a782aac4..6ec01196 100644
--- a/lib/chibi/mime.scm
+++ b/lib/chibi/mime.scm
@@ -24,15 +24,25 @@
 ;; most of these are plain text for easier viewing in the browser
 (define (mime-type-from-extension ext)
   (assq-ref
-   '((htm . "text/html; charset=utf-8")
+   '((c . "text/plain; charset=utf-8")
+     (css . "text/css; charset=utf-8")
+     (gif . "image/gif")
+     (h . "text/plain; charset=utf-8")
+     (htm . "text/html; charset=utf-8")
      (html . "text/html; charset=utf-8")
+     (jpeg . "image/jpeg")
+     (jpg . "image/jpeg")
+     (js . "application/javascript; charset=utf-8")
+     (json . "application/json; charset=utf-8")
+     (md . "text/plain; charset=utf-8")
+     (mp3 . "audio/mpeg")
+     (org . "text/plain; charset=utf-8")
+     (pdf . "application/pdf")
+     (png . "image/png")
      (scm . "text/plain; charset=utf-8")
      (sld . "text/plain; charset=utf-8")
-     (c . "text/plain; charset=utf-8")
-     (h . "text/plain; charset=utf-8")
-     (txt . "text/plain; charset=utf-8")
-     (org . "text/plain; charset=utf-8")
-     (md . "text/plain; charset=utf-8"))
+     (svg . "image/svg+xml")
+     (txt . "text/plain; charset=utf-8"))
    (and (string? ext) (string->symbol ext))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/lib/chibi/net/http-server.scm b/lib/chibi/net/http-server.scm
index 57d9a227..a1bb3f4e 100644
--- a/lib/chibi/net/http-server.scm
+++ b/lib/chibi/net/http-server.scm
@@ -524,7 +524,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Sample main.  In chibi-scheme you can run:
 ;;
-;; chibi-scheme -Rchibi.net.http-config-server -- [<cfg-file-or-directory>]
+;; chibi-scheme -Rchibi.net.http-server -- [<cfg-file-or-directory>]
 ;;
 ;; which defaults to serving the current directory on port 8000.