diff --git a/CHANGES b/CHANGES
index 02f2e4737..b154aeea3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,27 @@
+===== 5.8.0 =====
+
+====== Improvements ======
+
+  * Make Lwt_seq.of_list lazier, make Lwt_set.to_list tail-rec. (Samer Abdallah, #1019)
+
+  * Convert more Lwt.fail into raise to increase availibility of backtraces. (#1008)
+
+====== Documentation ======
+
+  * Small fixes. (Nils André, #1001, #1006)
+
+  * Convert manual to mld. (#951, Antonin Décimo)
+
+====== Other ======
+
+  * Many improbements to the CI. (Sora Morimoto, Idir Lankri, #986, #1009, #1011, #1013, #1014, #1016, #1020, #1021, #1023, #1024, #1025)
+
+  * Improbements to the packaging. (Sora Morimoto, #1010, #1015)
+
+  * Make C code pass the stricter checks of GCC 14. (Jerry James, #1004)
+
+  * Fix many many C warnings and other fixes. (Antonin Décimo, #1007, #1022)
+
 ===== 5.7.0 =====
 
 ====== Breaking API changes ======
diff --git a/lwt.opam b/lwt.opam
index 2f0979c47..cb65673fe 100644
--- a/lwt.opam
+++ b/lwt.opam
@@ -31,7 +31,7 @@ depends: [
 depopts: ["base-threads" "base-unix" "conf-libev"]
 dev-repo: "git+https://github.com/ocsigen/lwt.git"
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "exec"
@@ -54,3 +54,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+available: os-family != "windows" | "ocaml-version" < "5.2"
diff --git a/lwt.opam.template b/lwt.opam.template
index 8fc8771fc..dc64b241a 100644
--- a/lwt.opam.template
+++ b/lwt.opam.template
@@ -1,5 +1,5 @@
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "exec"
diff --git a/lwt_ppx.opam b/lwt_ppx.opam
index 958244c1f..b4a6b08fd 100644
--- a/lwt_ppx.opam
+++ b/lwt_ppx.opam
@@ -17,7 +17,7 @@ depends: [
   "lwt"
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"
diff --git a/lwt_ppx_let.opam b/lwt_ppx_let.opam
index 8fbb382a3..7ce9fe37e 100644
--- a/lwt_ppx_let.opam
+++ b/lwt_ppx_let.opam
@@ -17,7 +17,7 @@ depends: [
   "lwt"
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"
diff --git a/lwt_react.opam b/lwt_react.opam
index 7f5d7e195..236db54bb 100644
--- a/lwt_react.opam
+++ b/lwt_react.opam
@@ -17,7 +17,7 @@ depends: [
   "react" {>= "1.0.0"}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"