diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f9a61f328229cacc6d3cfee57b6bca12cb5ccdc..68aa2095efd24cf414093300095d623adc393a01 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,13 +29,13 @@ variables:
 build-coq.dev:
   <<: *template
   variables:
-    OPAM_PINS: "coq version dev   coq-mathcomp-ssreflect version dev"
+    OPAM_PINS: "coq version dev"
     VALIDATE: "1"
 
 build-coq.8.7.2:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.7.2   coq-mathcomp-ssreflect version 1.6.4"
+    OPAM_PINS: "coq version 8.7.2"
     OPAM_PKG: "coq-iris"
     TIMING_PROJECT: "iris"
     TIMING_CONF: "coq-8.7.2"
@@ -45,22 +45,17 @@ build-coq.8.7.2:
 build-coq.8.7.1:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.7.1   coq-mathcomp-ssreflect version 1.6.4"
+    OPAM_PINS: "coq version 8.7.1"
 
 build-coq.8.7.0:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.7.0   coq-mathcomp-ssreflect version 1.6.4"
-
-build-coq.8.6.1:
-  <<: *template
-  variables:
-    OPAM_PINS: "coq version 8.6.1   coq-mathcomp-ssreflect version 1.6.4"
+    OPAM_PINS: "coq version 8.7.0"
 
 build-stdpp.dev:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.7.2   coq-mathcomp-ssreflect version 1.6.4   coq-stdpp.dev git https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/#$STDPP_REV"
+    OPAM_PINS: "coq version 8.7.2   coq-stdpp.dev git https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/#$STDPP_REV"
   except:
   only:
   - triggers
diff --git a/README.md b/README.md
index c3da63d94afb8bb85272fb913d0cf0b3e591853d..335d0208c19a9ad7a8308b73c7e087bd9f482fb7 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,11 @@ This is the Coq development of the [Iris Project](http://iris-project.org).
 
 This version is known to compile with:
 
- - Coq 8.6.1 / 8.7.0 / 8.7.1 / 8.7.2
- - Ssreflect 1.6.4
+ - Coq 8.7.0 / 8.7.1 / 8.7.2
  - A development version of [std++](https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp)
 
+For a version compatible with Coq 8.6, have a look at the
+[iris-3.1 branch](https://gitlab.mpi-sws.org/FP/iris-coq/tree/iris-3.1).
 If you need to work with Coq 8.5, please check out the
 [iris-3.0 branch](https://gitlab.mpi-sws.org/FP/iris-coq/tree/iris-3.0).
 
diff --git a/opam b/opam
index 3bc79be65939b486c885ac35586630ccb3b1c762..2d5537572289f5162acdec9dec56edf6766f5045 100644
--- a/opam
+++ b/opam
@@ -10,7 +10,6 @@ build: [make "-j%{jobs}%"]
 install: [make "install"]
 remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/iris"]
 depends: [
-  "coq" { (>= "8.6.1" & < "8.8~") | (= "dev") }
-  "coq-mathcomp-ssreflect" { (>= "1.6.1" & < "1.7~") | (= "dev") }
+  "coq" { (>= "8.7.0" & < "8.8~") | (= "dev") }
   "coq-stdpp" { (= "dev.2018-04-11.0") | (= "dev") }
 ]
diff --git a/theories/algebra/base.v b/theories/algebra/base.v
index 79f8e4978406798c1221ae3887e41e39da0d2565..603e9c20cebe850070a8c639514fcc2949b87a97 100644
--- a/theories/algebra/base.v
+++ b/theories/algebra/base.v
@@ -1,8 +1,6 @@
-From mathcomp Require Export ssreflect.
+From Coq.ssr Require Export ssreflect.
 From stdpp Require Export prelude.
 Set Default Proof Using "Type".
-(* Reset options set by the ssreflect plugin to their defaults *)
-Global Set Bullet Behavior "Strict Subproofs".
 Global Open Scope general_if_scope.
-Global Unset Asymmetric Patterns.
+Global Set SsrOldRewriteGoalsOrder. (* See Coq issue #5706 *)
 Ltac done := stdpp.tactics.done.