diff --git a/dbapi.cabal b/dbapi.cabal
index adfbbba1e..ea5446319 100644
--- a/dbapi.cabal
+++ b/dbapi.cabal
@@ -17,6 +17,7 @@ executable dbapi
                      , HDBC, HDBC-postgresql
                      , warp, wai >= 3.0.1 && < 3.0.2
                      , wai-extra, wai-cors
+                     , wai-middleware-static
                      , HTTP, convertible
                      , case-insensitive
                      , http-types, scientific, time
@@ -54,6 +55,7 @@ Test-Suite spec
                      , HTTP, convertible
                      , case-insensitive
                      , wai-extra, wai-cors, containers
+                     , wai-middleware-static
                      , http-types, scientific, time
                      , bytestring, aeson, network >= 2.6
                      , text, optparse-applicative
diff --git a/src/Main.hs b/src/Main.hs
index 1407ac0c5..16dc35d24 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -13,6 +13,7 @@ import Control.Applicative
 import Options.Applicative hiding (columns)
 import Network.Wai.Middleware.Gzip (gzip, def)
 import Network.Wai.Middleware.Cors (cors)
+import Network.Wai.Middleware.Static (staticPolicy, only)
 
 argParser :: Parser AppConfig
 argParser = AppConfig
@@ -37,7 +38,10 @@ main = do
   Prelude.putStrLn $ "Listening on port " ++ (show $ configPort conf :: String)
   conn <- connectPostgreSQL' dburi
   run port $ (if configSecure conf then redirectInsecure else id)
-    . gzip def . cors corsPolicy . clientErrors
+    . gzip def
+    . cors corsPolicy
+    . clientErrors
+    . staticPolicy (only [("favicon.ico", "static/favicon.ico")])
     $ (inTransaction . authenticated (cs $ configAnonRole conf) . withSavepoint)
     app conn
   where
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 000000000..b3dd701f3
Binary files /dev/null and b/static/favicon.ico differ