diff --git a/Network/Tremulous/Protocol.hs b/Network/Tremulous/Protocol.hs
--- a/Network/Tremulous/Protocol.hs
+++ b/Network/Tremulous/Protocol.hs
@@ -4,7 +4,7 @@
 	, defaultDelay, parseGameServer, proto2string, string2proto, parseMasterServer
 ) where
 import Prelude as P hiding (Maybe(..), maybe)
-import Control.Applicative hiding (many)
+import Control.Applicative as A
 import Control.Monad.State.Strict
 
 import Data.Attoparsec.Char8 hiding (option)
@@ -146,7 +146,7 @@
 
 
 parseMasterServer :: ByteString -> [SockAddr]
-parseMasterServer = fromMaybe [] . parseMaybe (many addr)
+parseMasterServer = fromMaybe [] . parseMaybe (A.many addr)
 	where
 	wg = anyWord8
 	f :: (Integral a, Integral b) => a -> b
diff --git a/tremulous-query.cabal b/tremulous-query.cabal
--- a/tremulous-query.cabal
+++ b/tremulous-query.cabal
@@ -1,5 +1,5 @@
 Name:			tremulous-query
-Version:		1.0.4
+Version:		1.0.5
 Author:			Christoffer Öjeling
 Maintainer:		Christoffer Öjeling <christoffer@ojeling.net>
 License:		GPL-3
@@ -33,7 +33,7 @@
                         Network.Tremulous.StrictMaybe
                         Network.Tremulous.TupleReader
 
-  Build-Depends:        base>=4.3 && < 5, network, containers, bytestring, attoparsec, mtl, deepseq
+  Build-Depends:        base>=4.3 && < 5, network, containers, bytestring, attoparsec>=0.9, mtl, deepseq
   if os(windows)
       Build-Depends:    Win32
   Ghc-Options:          -Wall -fno-warn-unused-do-bind -fno-warn-orphans -funbox-strict-fields