diff --git a/Hledger/Cli/Commands/WebYesod.hs b/Hledger/Cli/Commands/WebYesod.hs
index 80c3dcd5b..b14bae729 100644
--- a/Hledger/Cli/Commands/WebYesod.hs
+++ b/Hledger/Cli/Commands/WebYesod.hs
@@ -7,6 +7,7 @@ module Hledger.Cli.Commands.WebYesod
 where
 import Control.Concurrent -- (forkIO)
 import Data.Either
+import Network.Wai.Handler.SimpleServer (run)
 import System.FilePath ((</>))
 import System.IO.Storage (withStore, putValue, getValue)
 import Text.Hamlet
@@ -58,7 +59,7 @@ server url port opts args j = do
               }
     withStore "hledger" $ do -- IO ()
      putValue "hledger" "journal" j
-     toWaiApp app >>= basicHandler port
+     toWaiApp app >>= run port
 
 data HledgerWebApp = HledgerWebApp {
       appOpts::[Opt]
diff --git a/hledger.cabal b/hledger.cabal
index 36abc47aa..45d62950f 100644
--- a/hledger.cabal
+++ b/hledger.cabal
@@ -120,6 +120,7 @@ executable hledger
                  ,hamlet >= 0.3.1 && < 0.4
                  ,io-storage >= 0.3 && < 0.4
                  ,wai >= 0.1 && < 0.2
+                 ,wai-extra >= 0.1 && < 0.2
                  ,yesod >= 0.3.1 && < 0.4
 
   if flag(chart)