diff --git a/Network/Wai/Application/Classic/Lang.hs b/Network/Wai/Application/Classic/Lang.hs
--- a/Network/Wai/Application/Classic/Lang.hs
+++ b/Network/Wai/Application/Classic/Lang.hs
@@ -2,9 +2,9 @@
 
 module Network.Wai.Application.Classic.Lang (parseLang) where
 
-import Control.Applicative hiding (many, optional)
-import Data.Attoparsec (Parser, takeWhile, parse, feed, Result(..))
-import Data.Attoparsec.Char8 (char, string, count, many, space, digit, option, sepBy1)
+import Control.Applicative hiding (optional)
+import Data.Attoparsec.ByteString (Parser, takeWhile, parse, feed, IResult(..))
+import Data.Attoparsec.ByteString.Char8 (char, string, count, space, digit, option, sepBy1)
 import Data.ByteString.Char8 hiding (map, count, take, takeWhile, notElem)
 import Data.List (sortBy)
 import Data.Ord
diff --git a/Network/Wai/Application/Classic/Range.hs b/Network/Wai/Application/Classic/Range.hs
--- a/Network/Wai/Application/Classic/Range.hs
+++ b/Network/Wai/Application/Classic/Range.hs
@@ -2,8 +2,9 @@
 
 module Network.Wai.Application.Classic.Range (skipAndSize) where
 
-import Control.Applicative hiding (many,optional)
-import Data.Attoparsec.Char8 hiding (take)
+import Control.Applicative hiding (optional)
+import Data.Attoparsec.ByteString hiding (satisfy)
+import Data.Attoparsec.ByteString.Char8 hiding (take)
 import Data.ByteString.Char8 hiding (map, count, take, elem)
 
 skipAndSize :: ByteString -> Integer -> Maybe (Integer,Integer)
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.4.0
+Version:                0.4.1
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3
@@ -33,7 +33,7 @@
   Build-Depends:        base >= 4 && < 5, process,
                         network, transformers,
                         filepath, directory, unix,
-                        containers, attoparsec,
+                        containers, attoparsec >= 0.10.0.0,
                         wai, enumerator >= 0.4.9,
                         bytestring, blaze-builder,
                         wai-app-static >= 0.3, http-types, http-date,