diff --git a/.travis.yml b/.travis.yml
index a5131aecd..7c2432128 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ env:
  - CABALVER=1.24 GHCVER=8.0.1
  - CABALVER=2.0  GHCVER=8.2.2
  - CABALVER=2.2  GHCVER=8.4.1
+ - CABALVER=2.4  GHCVER=8.6.1
 
 # Note: the distinction between `before_install` and `install` is not
 #       important.
diff --git a/README.md b/README.md
index a7a8f488b..d28f01383 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Supports:
  * GHC 8.0.2
  * GHC 8.2.1
  * GHC 8.4.1
- * GHC HEAD
+ * GHC 8.6.1
 
 Usage
 -----
diff --git a/protolude.cabal b/protolude.cabal
index 16b5463d4..f72a46fe5 100644
--- a/protolude.cabal
+++ b/protolude.cabal
@@ -65,16 +65,16 @@ library
     -fwarn-implicit-prelude
 
   build-depends:       
-    base                >= 4.6  && <4.12,
+    base                >= 4.6  && <4.13,
     array               >= 0.4  && <0.6,
     ghc-prim            >= 0.3  && <0.6,
     async               >= 2.0  && <2.3,
     deepseq             >= 1.3  && <1.5,
-    containers          >= 0.5  && <0.6,
+    containers          >= 0.5  && <0.7,
     hashable            >= 1.2  && <1.3,
     transformers        >= 0.2  && <0.6,
     text                >= 1.2  && <1.3,
-    stm                 >= 2.4  && <2.5,
+    stm                 >= 2.4  && <2.6,
     bytestring          >= 0.10 && <0.11,
     mtl                 >= 2.1  && <2.3,
     mtl-compat          >= 0.2  && <0.3,
diff --git a/src/Protolude.hs b/src/Protolude.hs
index dd3ea31d6..5376ca6bb 100644
--- a/src/Protolude.hs
+++ b/src/Protolude.hs
@@ -492,7 +492,7 @@ import qualified Control.Exception
 import Control.Monad.STM as X (
     STM
   , atomically
-#if ( __GLASGOW_HASKELL__ < 806 )
+#if !(MIN_VERSION_stm(2,5,0))
   , always
   , alwaysSucceeds
 #endif
diff --git a/stack-12.0.yaml b/stack-12.0.yaml
new file mode 100644
index 000000000..d7370699a
--- /dev/null
+++ b/stack-12.0.yaml
@@ -0,0 +1,6 @@
+resolver: lts-12.0
+packages:
+- '.'
+extra-deps:
+flags: {}
+extra-package-dbs: []