diff --git a/fileserve.go b/fileserve.go
index b568ce3..e1d2e16 100644
--- a/fileserve.go
+++ b/fileserve.go
@@ -35,6 +35,10 @@ func staticHandler(c web.C, w http.ResponseWriter, r *http.Request) {
 		notFoundHandler(c, w, r)
 		return
 	} else {
+		if path == "/favicon.ico" {
+			path = "/static/images/favicon.gif"
+		}
+
 		filePath := strings.TrimPrefix(path, "/static/")
 		file, err := staticBox.Open(filePath)
 		if err != nil {
diff --git a/server.go b/server.go
index 7fac1b8..2f314ec 100644
--- a/server.go
+++ b/server.go
@@ -99,6 +99,7 @@ func setup() {
 	goji.Delete("/:name", deleteHandler)
 
 	goji.Get("/static/*", staticHandler)
+	goji.Get("/favicon.ico", staticHandler)
 	goji.Get(nameRe, fileDisplayHandler)
 	goji.Get(selifRe, fileServeHandler)
 	goji.Get(selifIndexRe, unauthorizedHandler)