diff --git a/Network/Wai/Logger/Apache.hs b/Network/Wai/Logger/Apache.hs
--- a/Network/Wai/Logger/Apache.hs
+++ b/Network/Wai/Logger/Apache.hs
@@ -8,6 +8,9 @@
 #ifndef MIN_VERSION_base
 #define MIN_VERSION_base(x,y,z) 1
 #endif
+#ifndef MIN_VERSION_wai
+#define MIN_VERSION_wai(x,y,z) 1
+#endif
 
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as BS
@@ -55,17 +58,21 @@
   <> " "
   <> toLogStr (maybe "-" show msize)
   <> " \""
-  <> toLogStr (lookupRequestField' "referer" req)
+  <> toLogStr (fromMaybe "" mr)
   <> "\" \""
-  <> toLogStr (lookupRequestField' "user-agent" req)
+  <> toLogStr (fromMaybe "" mua)
   <> "\"\n"
   where
 #if !MIN_VERSION_base(4,5,0)
     (<>) = mappend
 #endif
-
-lookupRequestField' :: CI ByteString -> Request -> ByteString
-lookupRequestField' k req = fromMaybe "" . lookup k $ requestHeaders req
+#if MIN_VERSION_wai(3,2,0)
+    mr  = requestHeaderReferer req
+    mua = requestHeaderUserAgent req
+#else
+    mr  = lookup "referer" $ requestHeaders req
+    mua = lookup "user-agent" $ requestHeaders req
+#endif
 
 -- getSourceIP = getSourceIP fromString fromByteString
 
diff --git a/test/doctests.hs b/test/doctests.hs
--- a/test/doctests.hs
+++ b/test/doctests.hs
@@ -3,9 +3,4 @@
 import Test.DocTest
 
 main :: IO ()
-main = doctest [
-    "-idist/build/autogen/"
-  , "-optP-include"
-  , "-optPdist/build/autogen/cabal_macros.h"
-  , "Network/Wai/Logger.hs"
-  ]
+main = doctest ["Network"]
diff --git a/wai-logger.cabal b/wai-logger.cabal
--- a/wai-logger.cabal
+++ b/wai-logger.cabal
@@ -1,5 +1,5 @@
 Name:                   wai-logger
-Version:                2.2.4.1
+Version:                2.2.5
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3
@@ -44,7 +44,7 @@
   Ghc-Options:          -Wall
   Main-Is:              doctests.hs
   Build-Depends:        base
-                      , doctest
+                      , doctest >= 0.10.1
 
 Source-Repository head
   Type:                 git