diff --git a/hledger-web/Hledger/Web/Main.hs b/hledger-web/Hledger/Web/Main.hs
index 3da4bde17..de362b9bb 100644
--- a/hledger-web/Hledger/Web/Main.hs
+++ b/hledger-web/Hledger/Web/Main.hs
@@ -17,6 +17,7 @@ import Settings            --  (parseExtra)
 import Application          (makeApplication)
 import Data.Conduit.Network (HostPreference(HostIPv4))
 import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
+import Network.Wai.Handler.Launch (run, runUrl, runUrlPort)
 --
 import Prelude hiding (putStrLn)
 import Control.Monad (when)
@@ -74,6 +75,7 @@ server baseurl port opts j = do
             , appHost = HostIPv4
             , appExtra = Extra "" Nothing
             })
-    runSettings defaultSettings
-        { settingsPort = port_ opts
-        } app
+    -- runSettings defaultSettings
+    --     { settingsPort = port_ opts
+    --     } app
+    run app
diff --git a/hledger-web/devel.hs b/hledger-web/devel.hs
index 12462e576..d7408bd3d 100644
--- a/hledger-web/devel.hs
+++ b/hledger-web/devel.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE PackageImports #-}
 import "hledger-web" Application (getApplicationDev)
-import Network.Wai.Handler.Warp
-    (runSettings, defaultSettings, settingsPort)
+import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
+import Network.Wai.Handler.Launch (run, runUrl, runUrlPort)
 import Control.Concurrent (forkIO)
 import System.Directory (doesFileExist, removeFile)
 import System.Exit (exitSuccess)
@@ -12,9 +12,10 @@ main = do
     putStrLn "Starting devel application"
     (port, app) <- getApplicationDev
     forkIO $
-        runSettings defaultSettings
-          { settingsPort = port
-          } app
+        -- runSettings defaultSettings
+        --   { settingsPort = port
+        --   } app
+        run app
     loop
 
 loop :: IO ()
diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index e2d57b3cc..ff021485a 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -156,6 +156,7 @@ library
                    , transformers
                    , wai
                    , wai-extra
+                   , wai-handler-launch       >= 1.3 && < 1.4
                    , warp
                    , yaml
 
@@ -245,6 +246,7 @@ executable         hledger-web
                    , transformers
                    , wai
                    , wai-extra
+                   , wai-handler-launch       >= 1.3 && < 1.4
                    , warp
                    , yaml
                    , hjsmin                        >= 0.1        && < 0.2