diff --git a/mighttpd2.cabal b/mighttpd2.cabal
--- a/mighttpd2.cabal
+++ b/mighttpd2.cabal
@@ -1,5 +1,5 @@
 Name:                   mighttpd2
-Version:                3.2.2
+Version:                3.2.3
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3
@@ -57,8 +57,8 @@
                       , unix-time
                       , unordered-containers
                       , wai >= 3.0
-                      , wai-app-file-cgi >= 3.0
-                      , warp >= 3.0.1
+                      , wai-app-file-cgi >= 3.0.3
+                      , warp >= 3.0.2
 
 Executable mighty
   Default-Language:     Haskell2010
@@ -82,9 +82,9 @@
                       , unix
                       , streaming-commons
                       , wai >= 3.0
-                      , wai-app-file-cgi >= 3.0
+                      , wai-app-file-cgi >= 3.0.3
                       , wai-logger >= 2.2.2
-                      , warp >= 3.0.1
+                      , warp >= 3.0.2
   if flag(tls)
     Build-Depends:      tls
                       , warp-tls >= 1.4.1
diff --git a/src/Server.hs b/src/Server.hs
--- a/src/Server.hs
+++ b/src/Server.hs
@@ -150,6 +150,7 @@
             $ setOnException     (if debug then printStdout else warpHandler rpt)
             $ setTimeout         (opt_connection_timeout opt) -- seconds
             $ setFdCacheDuration (opt_fd_cache_duration opt)
+            $ setServerName      serverName
             defaultSettings
     serverName = BS.pack $ opt_server_name opt
     cspec = ClassicAppSpec {
diff --git a/src/WaiApp.hs b/src/WaiApp.hs
--- a/src/WaiApp.hs
+++ b/src/WaiApp.hs
@@ -43,8 +43,7 @@
         Nothing  -> Fail
         Just blk -> getRoute path blk
     fastResponse resp st hdr body = resp $ responseLBS st hdr body
-    defaultHeader = [("Content-Type", "text/plain")
-                    ,("Server", softwareName cspec)]
+    defaultHeader = [("Content-Type", "text/plain")]
     req' = req { rawPathInfo = path } -- FIXME
 
 getBlock :: ByteString -> RouteDB -> Maybe [Route]