diff --git a/.travis.yml b/.travis.yml
index 2f8183ba..bd0c2d5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ env:
   global:
     - TESTS=false
     - PINS="lwt.dev:https://github.com/mirage/lwt.git#tracing"
+    # Needed until the cohttp-mirage (formerly mirage-http) is merged
+    - EXTRA_REMOTES="git://github.com/djs55/mirage-dev.git#cohttp"
     - UPDATE_GCC_BINUTILS=1
   matrix:
     - OCAML_VERSION=4.03 WITH_TRACING=1 POST_INSTALL_HOOK="make MODE=unix && make testrun SUDO=sudo && make clean"
diff --git a/applications/static_website_tls/dispatch.ml b/applications/static_website_tls/dispatch.ml
index b919b575..a5659644 100644
--- a/applications/static_website_tls/dispatch.ml
+++ b/applications/static_website_tls/dispatch.ml
@@ -1,7 +1,7 @@
 open Lwt.Infix
 
 (** Common signature for http and https. *)
-module type HTTP = Cohttp_lwt.Server
+module type HTTP = Cohttp_lwt.S.Server
 
 (* Logging *)
 let https_src = Logs.Src.create "https" ~doc:"HTTPS server"
diff --git a/device-usage/conduit_server/config.ml b/device-usage/conduit_server/config.ml
index 5cc49027..99d347bc 100644
--- a/device-usage/conduit_server/config.ml
+++ b/device-usage/conduit_server/config.ml
@@ -1,7 +1,7 @@
 open Mirage
 
 let handler =
-  let packages = [package "mirage-http"] in
+  let packages = [package "cohttp-mirage"] in
   foreign
     ~packages
     "Unikernel.Main" (conduit @-> job)
diff --git a/device-usage/http-fetch/config.ml b/device-usage/http-fetch/config.ml
index 94f8ffda..889a853d 100644
--- a/device-usage/http-fetch/config.ml
+++ b/device-usage/http-fetch/config.ml
@@ -1,7 +1,7 @@
 open Mirage
 
 let client =
-  let packages = [ package "mirage-http"; package "duration" ] in
+  let packages = [ package "cohttp-mirage"; package "duration" ] in
   foreign
     ~packages
     "Unikernel.Client" @@ time @-> console @-> resolver @-> conduit @-> job