diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index aef93c517f..5d95f1ed4d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,6 +16,7 @@ updates:
       - '/gemfiles/3.2'
       - '/gemfiles/3.3'
       - '/gemfiles/3.4'
+      - '/gemfiles/3.5'
       - '/gemfiles/jruby'
       - '/gemfiles/truffleruby'
       - '/gemfiles/typecheck'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4b6420de5a..bff32656b2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -81,7 +81,7 @@ jobs:
       fail-fast: false
       matrix:
         target:
-          - { ruby: "head", gemfile: "3.4" }
+          - { ruby: "head", gemfile: "3.5" }
           - { ruby: "jruby", gemfile: "jruby" }
           - { ruby: "truffleruby", gemfile: "truffleruby" }
     runs-on: ubuntu-latest
@@ -247,7 +247,8 @@ jobs:
           - { ruby: "3.1", os: "ubuntu-latest", gemfile: "3.1" }
           - { ruby: "3.2", os: "ubuntu-latest", gemfile: "3.2" }
           - { ruby: "3.3", os: "ubuntu-latest", gemfile: "3.3" }
-          - { ruby: "head", os: "ubuntu-latest", gemfile: "3.4" }
+          - { ruby: "3.4", os: "ubuntu-latest", gemfile: "3.4" }
+          - { ruby: "head", os: "ubuntu-latest", gemfile: "3.5" }
           - { ruby: "jruby", os: "ubuntu-latest", gemfile: "jruby" }
           - { ruby: "truffleruby", os: "ubuntu-latest", gemfile: "truffleruby" }
 
@@ -256,7 +257,8 @@ jobs:
           - { ruby: "3.1", os: "macos-latest", gemfile: "3.1" }
           - { ruby: "3.2", os: "macos-latest", gemfile: "3.2" }
           - { ruby: "3.3", os: "macos-latest", gemfile: "3.3" }
-          - { ruby: "head", os: "macos-latest", gemfile: "3.4" }
+          - { ruby: "3.4", os: "macos-latest", gemfile: "3.4" }
+          - { ruby: "head", os: "macos-latest", gemfile: "3.5" }
           - { ruby: "jruby", os: "macos-latest", gemfile: "jruby" }
           - { ruby: "truffleruby", os: "macos-latest", gemfile: "truffleruby" }
 
@@ -265,7 +267,8 @@ jobs:
           - { ruby: "3.1", os: "windows-latest", gemfile: "3.1" }
           - { ruby: "3.2", os: "windows-latest", gemfile: "3.2" }
           - { ruby: "3.3", os: "windows-latest", gemfile: "3.3" }
-          - { ruby: "head", os: "windows-latest", gemfile: "3.4" }
+          # - { ruby: "3.4", os: "windows-latest", gemfile: "3.4" }
+          # - { ruby: "head", os: "windows-latest", gemfile: "3.5" }
           - { ruby: "jruby", os: "windows-latest", gemfile: "jruby" }
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.target.gemfile }}/Gemfile
diff --git a/bin/prism b/bin/prism
index ccbf020278..3682e22c9d 100755
--- a/bin/prism
+++ b/bin/prism
@@ -94,7 +94,8 @@ module Prism
         ["3.1", ["3.1"]],
         ["3.2", ["3.2"]],
         ["3.3", ["3.3"]],
-        ["3.4", ["3.4", "typecheck"]],
+        ["3.4", ["3.4"]],
+        ["3.5", ["3.5", "typecheck"]],
         ["jruby", ["jruby"]],
         ["truffleruby", ["truffleruby"]]
       ].each do |ruby_version, gemfiles|
diff --git a/gemfiles/3.4/Gemfile b/gemfiles/3.4/Gemfile
index 0b59662a56..6cadd5e93a 100644
--- a/gemfiles/3.4/Gemfile
+++ b/gemfiles/3.4/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "~> 3.4.0.dev"
+ruby "~> 3.4.0"
 
 gemspec path: "../.."
 
diff --git a/gemfiles/3.4/Gemfile.lock b/gemfiles/3.4/Gemfile.lock
index 8285927d9a..a93275261a 100644
--- a/gemfiles/3.4/Gemfile.lock
+++ b/gemfiles/3.4/Gemfile.lock
@@ -44,7 +44,7 @@ DEPENDENCIES
   test-unit
 
 RUBY VERSION
-   ruby 3.4.0.dev
+   ruby 3.4.1p0
 
 BUNDLED WITH
-   2.6.1
+   2.6.2
diff --git a/gemfiles/3.5/Gemfile b/gemfiles/3.5/Gemfile
new file mode 100644
index 0000000000..84787640b0
--- /dev/null
+++ b/gemfiles/3.5/Gemfile
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+ruby "~> 3.5.0.dev"
+
+gemspec path: "../.."
+
+gem "ffi"
+gem "onigmo", platforms: :ruby
+gem "parser"
+gem "rake-compiler"
+gem "rake"
+gem "rbs"
+gem "ruby_memcheck"
+gem "test-unit"
diff --git a/gemfiles/3.5/Gemfile.lock b/gemfiles/3.5/Gemfile.lock
new file mode 100644
index 0000000000..864a8fb1eb
--- /dev/null
+++ b/gemfiles/3.5/Gemfile.lock
@@ -0,0 +1,50 @@
+PATH
+  remote: ../..
+  specs:
+    prism (1.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    ffi (1.17.0)
+    logger (1.6.4)
+    mini_portile2 (2.8.8)
+    nokogiri (1.17.2)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    onigmo (0.1.0)
+    parser (3.3.6.0)
+      ast (~> 2.4.1)
+      racc
+    power_assert (2.0.4)
+    racc (1.8.1)
+    rake (13.2.1)
+    rake-compiler (1.2.8)
+      rake
+    rbs (3.7.0)
+      logger
+    ruby_memcheck (3.0.0)
+      nokogiri
+    test-unit (3.6.7)
+      power_assert
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ffi
+  onigmo
+  parser
+  prism!
+  rake
+  rake-compiler
+  rbs
+  ruby_memcheck
+  test-unit
+
+RUBY VERSION
+   ruby 3.5.0.dev
+
+BUNDLED WITH
+   2.6.2