diff --git a/Network/Wai/Application/Classic/CGI.hs b/Network/Wai/Application/Classic/CGI.hs
--- a/Network/Wai/Application/Classic/CGI.hs
+++ b/Network/Wai/Application/Classic/CGI.hs
@@ -11,8 +11,7 @@
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as BS
 import Data.Char
-import Data.Enumerator (Iteratee,Enumeratee,run_,($$),joinI)
-import qualified Data.Enumerator as E (map)
+import Data.Enumerator hiding (map, filter, drop, break)
 import qualified Data.Enumerator.Binary as EB
 import qualified Data.Enumerator.List as EL
 import Network.Wai
@@ -82,7 +81,7 @@
     (prog, scriptName, pathinfo) = pathinfoToCGI (cgiSrc cgii)
                                                  (cgiDst cgii)
                                                  (pathInfo req)
-    toBuilder = E.map fromByteString
+    toBuilder = EL.map fromByteString
     emptyBody = EB.isolate 0
     response build status hs = toBuilder =$ build status hs
     check hs = lookupField fkContentType hs >> case lookupField "status" hs of
@@ -150,13 +149,6 @@
     (prog',pathinfo) = break (== '/') path'
     prog = dst </> prog'
     scriptName = src' </> prog'
-
-----------------------------------------------------------------
-
-infixr 0 =$
-
-(=$) :: Monad m => Enumeratee ao ai m b -> Iteratee ai m b -> Iteratee ao m b
-ee =$ ie = joinI $ ee $$ ie
 
 ----------------------------------------------------------------
 
diff --git a/wai-app-file-cgi.cabal b/wai-app-file-cgi.cabal
--- a/wai-app-file-cgi.cabal
+++ b/wai-app-file-cgi.cabal
@@ -1,5 +1,5 @@
 Name:                   wai-app-file-cgi
-Version:                0.0.1
+Version:                0.0.2
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3
@@ -8,7 +8,7 @@
 Description:            This WAI application handles static files and
                         executes CGI scripts.
 Homepage:               http://www.mew.org/~kazu/
-Category:               Web
+Category:               Web, Yesod
 Cabal-Version:          >= 1.6
 Build-Type:             Simple
 library
@@ -34,7 +34,8 @@
                         network >=2.2 && <2.3, transformers, time,
                         filepath, directory, unix,
                         containers, attoparsec,
-                        wai, enumerator, bytestring, blaze-builder,
+                        wai, enumerator >= 0.4.9,
+                        bytestring, blaze-builder,
                         wai-app-static
 Source-Repository head
   Type:                 git