diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec521d2ac76fc4983b0838b22dbd85a51e8704b0..0b579d541af83bad2294ac30b5e11b5776b496ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,6 +44,11 @@ variables:
 
 ## Build jobs
 
+build-coq.8.18.0:
+  <<: *template
+  variables:
+    OPAM_PINS: "coq version 8.18.0"
+
 build-coq.8.17.0:
   <<: *template
   variables:
diff --git a/README.md b/README.md
index 0ee4e13b8492346db6f445b714cdcf84818736ec..c867782a18a66fbd509a2a0407195a3065debc26 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Notably:
 
 This version is known to compile with:
 
- - Coq version 8.15.2 / 8.16.1 / 8.17.0
+ - Coq version 8.15.2 / 8.16.1 / 8.17.0 / 8.18.0
 
 Generally we always aim to support the last two stable Coq releases. Support for
 older versions will be dropped when it is convenient.
diff --git a/coq-stdpp.opam b/coq-stdpp.opam
index 4da0f5edcd92ad72b2dbb5b7daab6d4866a1b176..09a09511997509d73933229285bc1d83a9c8403c 100644
--- a/coq-stdpp.opam
+++ b/coq-stdpp.opam
@@ -33,7 +33,7 @@ tags: [
 ]
 
 depends: [
-  "coq" { (>= "8.15" & < "8.18~") | (= "dev") }
+  "coq" { (>= "8.15" & < "8.19~") | (= "dev") }
 ]
 
 build: ["./make-package" "stdpp" "-j%{jobs}%"]