diff --git a/.travis.yml b/.travis.yml
index bb0390c..005f946 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,10 @@ before_cache:
 
 matrix:
   include:
-    - compiler: "ghc-8.6.4"
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.4], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.8.1"
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.6.5"
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
     - compiler: "ghc-8.4.4"
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
     - compiler: "ghc-8.2.2"
diff --git a/postgresql-libpq.cabal b/postgresql-libpq.cabal
index e1fe2e5..7d8eba1 100644
--- a/postgresql-libpq.cabal
+++ b/postgresql-libpq.cabal
@@ -37,7 +37,7 @@ extra-source-files:
 
 Custom-setup
   setup-depends:
-    base >= 4.3 && <5, Cabal >= 1.10 && <2.5
+    base >= 4.3 && <5, Cabal >= 1.10 && <3.1
 
 -- If true,  use pkg-config,  otherwise use the pg_config based build
 -- configuration
@@ -51,7 +51,7 @@ Library
   include-dirs:        cbits
   Exposed-modules:     Database.PostgreSQL.LibPQ
                        Database.PostgreSQL.LibPQ.Internal
-  Build-depends:       base       >=4.3     && <4.13
+  Build-depends:       base       >=4.3     && <4.14
                      , bytestring >=0.9.1.0 && <0.11
 
   if !os(windows)