diff --git a/.travis.yml b/.travis.yml
index 94e1685a45..e4f2e0db4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,26 +7,26 @@ script: bash -ex ./.travis-docker.sh
 env:
   global:
   - EXTRA_REMOTES="https://github.com/mirage/mirage-dev.git"
-  - PINS="cohttp-top:. cohttp-async:. cohttp-lwt-unix:. cohttp-lwt-jsoo:. cohttp-lwt:. mirage-http:. cohttp:."
+  - PINS="cohttp-top:. cohttp-async:. cohttp-lwt-unix:. cohttp-lwt-jsoo:. cohttp-lwt:. cohttp-mirage:. cohttp:."
   matrix:
   - PACKAGE="cohttp" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
   - PACKAGE="cohttp-async" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
   - PACKAGE="cohttp-lwt-unix" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
   - PACKAGE="cohttp-lwt-jsoo" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
   - PACKAGE="cohttp-lwt" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
-  - PACKAGE="mirage-http" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
+  - PACKAGE="cohttp-mirage" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
   - PACKAGE="cohttp" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
   - PACKAGE="cohttp-async" DISTRO="alpine" OCAML_VERSION="4.03.0"
   - PACKAGE="cohttp-lwt-unix" DISTRO="alpine" OCAML_VERSION="4.03.0"
   - PACKAGE="cohttp-lwt-jsoo" DISTRO="alpine" OCAML_VERSION="4.03.0"
   - PACKAGE="cohttp-lwt" DISTRO="alpine" OCAML_VERSION="4.03.0"
-  - PACKAGE="mirage-http" DISTRO="alpine" OCAML_VERSION="4.03.0"
+  - PACKAGE="cohttp-mirage" DISTRO="alpine" OCAML_VERSION="4.03.0"
   - PACKAGE="cohttp" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
   - PACKAGE="cohttp-async" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
   - PACKAGE="cohttp-lwt-unix" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
   - PACKAGE="cohttp-lwt-jsoo" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
   - PACKAGE="cohttp-lwt" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
-  - PACKAGE="mirage-http" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
+  - PACKAGE="cohttp-mirage" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
 notifications:
   webhooks:
     urls:
diff --git a/README.md b/README.md
index ffe20805b0..ec42a1de7c 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,7 @@ libraries:
   library.
 * `Cohttp_lwt` exposes an OS-independent Lwt interface, which is used
   by the [Mirage](http://www.openmirage.org) interface
-  to generate standalone microkernels (see the [mirage-http](https://github.com/mirage/mirage-http)
-  repository).
+  to generate standalone microkernels use the cohttp-mirage subpackage.
 * `Cohttp_lwt_xhr` compiles to a JavaScript module that maps the Cohttp
    calls to XMLHTTPRequests.  This is used to compile OCaml libraries like
    the GitHub bindings to JavaScript and still run efficiently.
diff --git a/mirage-http-CHANGES.md b/cohttp-mirage-CHANGES.md
similarity index 100%
rename from mirage-http-CHANGES.md
rename to cohttp-mirage-CHANGES.md
diff --git a/mirage-http.opam b/cohttp-mirage.opam
similarity index 100%
rename from mirage-http.opam
rename to cohttp-mirage.opam
diff --git a/mirage-http/src/client.ml b/cohttp-mirage/src/client.ml
similarity index 100%
rename from mirage-http/src/client.ml
rename to cohttp-mirage/src/client.ml
diff --git a/mirage-http/src/client.mli b/cohttp-mirage/src/client.mli
similarity index 100%
rename from mirage-http/src/client.mli
rename to cohttp-mirage/src/client.mli
diff --git a/mirage-http/src/cohttp_mirage.ml b/cohttp-mirage/src/cohttp_mirage.ml
similarity index 100%
rename from mirage-http/src/cohttp_mirage.ml
rename to cohttp-mirage/src/cohttp_mirage.ml
diff --git a/mirage-http/src/io.ml b/cohttp-mirage/src/io.ml
similarity index 100%
rename from mirage-http/src/io.ml
rename to cohttp-mirage/src/io.ml
diff --git a/mirage-http/src/io.mli b/cohttp-mirage/src/io.mli
similarity index 100%
rename from mirage-http/src/io.mli
rename to cohttp-mirage/src/io.mli
diff --git a/mirage-http/src/jbuild b/cohttp-mirage/src/jbuild
similarity index 89%
rename from mirage-http/src/jbuild
rename to cohttp-mirage/src/jbuild
index bab14708b5..2da479ba1c 100644
--- a/mirage-http/src/jbuild
+++ b/cohttp-mirage/src/jbuild
@@ -2,7 +2,7 @@
 
 (library
  ((name cohttp_mirage)
-  (public_name mirage-http)
+  (public_name cohttp-mirage)
   (synopsis "Mirage backend for cohttp")
   (wrapped false)
   (libraries
diff --git a/mirage-http/src/make.ml b/cohttp-mirage/src/make.ml
similarity index 100%
rename from mirage-http/src/make.ml
rename to cohttp-mirage/src/make.ml
diff --git a/mirage-http/src/make.mli b/cohttp-mirage/src/make.mli
similarity index 100%
rename from mirage-http/src/make.mli
rename to cohttp-mirage/src/make.mli
diff --git a/mirage-http/src/server_with_conduit.ml b/cohttp-mirage/src/server_with_conduit.ml
similarity index 100%
rename from mirage-http/src/server_with_conduit.ml
rename to cohttp-mirage/src/server_with_conduit.ml
diff --git a/mirage-http/src/server_with_conduit.mli b/cohttp-mirage/src/server_with_conduit.mli
similarity index 100%
rename from mirage-http/src/server_with_conduit.mli
rename to cohttp-mirage/src/server_with_conduit.mli
diff --git a/mirage-http/src/static.ml b/cohttp-mirage/src/static.ml
similarity index 100%
rename from mirage-http/src/static.ml
rename to cohttp-mirage/src/static.ml
diff --git a/mirage-http/src/static.mli b/cohttp-mirage/src/static.mli
similarity index 100%
rename from mirage-http/src/static.mli
rename to cohttp-mirage/src/static.mli
diff --git a/pkg/pkg.ml b/pkg/pkg.ml
index d0d6ae0a0c..2e34f15734 100644
--- a/pkg/pkg.ml
+++ b/pkg/pkg.ml
@@ -5,7 +5,6 @@ open Topkg
 
 let () =
   Topkg_jbuilder.describe
-    ~name:"cohttp"
     ~change_logs:[ Pkg.std_file "CHANGES.md"
-                 ; Pkg.std_file "mirage-http-CHANGES.md" ]
+                 ; Pkg.std_file "cohttp-mirage-CHANGES.md" ]
     ()