diff --git a/.github/workflows/minitest.yml b/.github/workflows/minitest.yml
index 5c5473e..622f2a7 100644
--- a/.github/workflows/minitest.yml
+++ b/.github/workflows/minitest.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rails-version: ['3.2', '4.0', '4.1', '4.2', '5.0', '5.1', '5.2', '6.0', '6.1']
+        rails-version: ['3.2', '4.0', '4.1', '4.2', '5.0', '5.1', '5.2', '6.0', '6.1', '7.0']
         ruby-version: ['2.4', '2.5', '2.6', '2.7', '3.0']
         exclude:
           - rails-version: '3.2'
@@ -49,6 +49,13 @@ jobs:
 
           - rails-version: '6.1'
             ruby-version: '2.4'
+
+          - rails-version: '7.0'
+            ruby-version: '2.4'
+          - rails-version: '7.0'
+            ruby-version: '2.5'
+          - rails-version: '7.0'
+            ruby-version: '2.6'
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
diff --git a/CHANGELOG b/CHANGELOG
index aa84423..7a4f76c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+2022-01-04 - v0.9.9
+
+2022-01-04 - Rails 7 compatibility [pelargir]
+
 2021-10-11 - v0.9.8
 
 2021-10-10 - Custom session timeout method [JunaidUK]
diff --git a/auto-session-timeout.gemspec b/auto-session-timeout.gemspec
index f8fafe9..1027dcf 100644
--- a/auto-session-timeout.gemspec
+++ b/auto-session-timeout.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "actionpack", [">= 3.2", "< 7"]
+  spec.add_dependency "actionpack", [">= 3.2", "< 7.1"]
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", [">= 4.2", "< 6"]
diff --git a/lib/auto/session/timeout/version.rb b/lib/auto/session/timeout/version.rb
index 3a0c0f8..08c291f 100644
--- a/lib/auto/session/timeout/version.rb
+++ b/lib/auto/session/timeout/version.rb
@@ -1,7 +1,7 @@
 module Auto
   module Session
     module Timeout
-      VERSION = "0.9.8"
+      VERSION = "0.9.9"
     end
   end
 end