diff --git a/Network/Wai/Frontend/MonadCGI.hs b/Network/Wai/Frontend/MonadCGI.hs
--- a/Network/Wai/Frontend/MonadCGI.hs
+++ b/Network/Wai/Frontend/MonadCGI.hs
@@ -67,6 +67,4 @@
     [ ("PATH_INFO", S8.unpack $ rawPathInfo e)
     , ("REQUEST_METHOD", show $ requestMethod e)
     , ("QUERY_STRING", S8.unpack $ rawQueryString e)
-    , ("SERVER_NAME", S8.unpack $ serverName e)
-    , ("SERVER_PORT", show $ serverPort e)
     ]
diff --git a/wai-frontend-monadcgi.cabal b/wai-frontend-monadcgi.cabal
--- a/wai-frontend-monadcgi.cabal
+++ b/wai-frontend-monadcgi.cabal
@@ -1,5 +1,5 @@
 name:            wai-frontend-monadcgi
-version:         1.3.0.2
+version:         2.0.0
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -20,7 +20,7 @@
                  , http-types
                  , transformers
                  , case-insensitive
-                 , wai               >= 1.3      && < 1.5
+                 , wai               >= 2.0      && < 2.1
     exposed-modules: Network.Wai.Frontend.MonadCGI
     ghc-options:     -Wall