diff --git a/lib/lwt_eio.ml b/lib/lwt_eio.ml
index 458cc8c..d62ed9a 100644
--- a/lib/lwt_eio.ml
+++ b/lib/lwt_eio.ml
@@ -40,7 +40,7 @@ let fork_with_cancel ~sw fn =
       We intercept that attempt and prevent the handler from changing.
 
    2. Lwt installs its handler first (e.g. because someone ran a Lwt event loop for a bit before using Eio).
-      In that case, Eio has already replaced Lwt's handler.
+      In that case, Eio will already have replaced Lwt's handler by the time we get called.
 
    Either way, Eio ends up owning the installed handler. We also want things to continue working if the Eio
    event loop finishes and then the application runs a plain Lwt loop. That's why we use [register_immediate],
diff --git a/lwt_eio.opam b/lwt_eio.opam
index cac7ab8..26d8266 100644
--- a/lwt_eio.opam
+++ b/lwt_eio.opam
@@ -32,3 +32,10 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/ocaml-multicore/lwt_eio.git"
+pin-depends: [
+  ["eio.dev" "git+https://github.com/ocaml-multicore/eio.git#3e49036b633979995e51ec83feb2732e9c6ce1aa"]
+  ["eio_linux.dev" "git+https://github.com/ocaml-multicore/eio.git#3e49036b633979995e51ec83feb2732e9c6ce1aa"]
+  ["eio_posix.dev" "git+https://github.com/ocaml-multicore/eio.git#3e49036b633979995e51ec83feb2732e9c6ce1aa"]
+  ["eio_main.dev" "git+https://github.com/ocaml-multicore/eio.git#3e49036b633979995e51ec83feb2732e9c6ce1aa"]
+  ["lwt.dev" "git+https://github.com/talex5/lwt.git#d4367052c1be8372d33661c01749086e56af623c"]
+]
diff --git a/lwt_eio.opam.template b/lwt_eio.opam.template
new file mode 100644
index 0000000..57874a0
--- /dev/null
+++ b/lwt_eio.opam.template
@@ -0,0 +1,7 @@
+pin-depends: [
+  ["eio.dev" "git+https://github.com/ocaml-multicore/eio.git#3e49036b633979995e51ec83feb2732e9c6ce1aa"]
+  ["eio_linux.dev" "git+https://github.com/ocaml-multicore/eio.git#3e49036b633979995e51ec83feb2732e9c6ce1aa"]
+  ["eio_posix.dev" "git+https://github.com/ocaml-multicore/eio.git#3e49036b633979995e51ec83feb2732e9c6ce1aa"]
+  ["eio_main.dev" "git+https://github.com/ocaml-multicore/eio.git#3e49036b633979995e51ec83feb2732e9c6ce1aa"]
+  ["lwt.dev" "git+https://github.com/talex5/lwt.git#d4367052c1be8372d33661c01749086e56af623c"]
+]