diff --git a/.travis.yml b/.travis.yml
index 40b0119..9c58048 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,8 @@ matrix:
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
     - env: CABALVER=2.0 GHCVER=8.2.2
       addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
+    - env: CABALVER=2.2 GHCVER=8.4.2
+      addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.2], sources: [hvr-ghc]}}
     - os: osx
 
 before_install:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c777924..c913078 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.3.5.5
+* Adding tested compatibility with GHC 8.4
+
 ## 0.3.5.4
 * Support for temporary 1.3
 
diff --git a/hapistrano.cabal b/hapistrano.cabal
index 3d8265c..373d1ff 100644
--- a/hapistrano.cabal
+++ b/hapistrano.cabal
@@ -1,5 +1,5 @@
 name:                hapistrano
-version:             0.3.5.4
+version:             0.3.5.5
 synopsis:            A deployment library for Haskell applications
 description:
   .
@@ -27,7 +27,8 @@ category:            System
 homepage:            https://github.com/stackbuilders/hapistrano
 bug-reports:         https://github.com/stackbuilders/hapistrano/issues
 build-type:          Simple
-cabal-version:       >=1.10
+cabal-version:       >=1.18
+tested-with:         GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.2
 extra-source-files:  CHANGELOG.md
                    , README.md
 data-files:          script/clean-build.sh
diff --git a/stack.yaml b/stack.yaml
index c86ef74..18ebe88 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,3 +1,3 @@
-resolver: lts-11.4
+resolver: lts-11.5
 packages:
 - '.'