diff --git a/changelog b/changelog
index 67a0973e..a6db5862 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,24 @@ Fixes
 
 3) Some fixes for WinCE build
 
+4) Additional canned mimetypes for mounts, the full list is
+
+	.ico    image/x-icon
+	.gif    image/gif
+	.js     text/javascript
+	.png    image/png
+	.jpg    image/jpeg
+	.gz     application/gzip
+	.JPG    image/jpeg
+	.html   text/html
+	.css    text/css
+	.txt    text/plain
+	.ttf    application/x-font-ttf
+	.woff   application/font-woff
+	.xml    application/xml
+
+
+
 
 v2.0.0
 ======
diff --git a/lib/server.c b/lib/server.c
index 33f6c183..0e06cfa4 100644
--- a/lib/server.c
+++ b/lib/server.c
@@ -214,15 +214,30 @@ static const char * get_mimetype(const char *file)
 	if (!strcmp(&file[n - 4], ".jpg"))
 		return "image/jpeg";
 
+	if (!strcmp(&file[n - 3], ".gz"))
+		return "application/gzip";
+
+	if (!strcmp(&file[n - 4], ".JPG"))
+		return "image/jpeg";
+
 	if (!strcmp(&file[n - 5], ".html"))
 		return "text/html";
 
 	if (!strcmp(&file[n - 4], ".css"))
 		return "text/css";
 
+	if (!strcmp(&file[n - 4], ".txt"))
+		return "text/plain";
+
 	if (!strcmp(&file[n - 4], ".ttf"))
 		return "application/x-font-ttf";
 
+	if (!strcmp(&file[n - 5], ".woff"))
+		return "application/font-woff";
+
+	if (!strcmp(&file[n - 4], ".xml"))
+		return "application/xml";
+
 	return NULL;
 }