diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1325988..3389e52 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
 
     environment:
       name: rubygems.org
-      url: https://rubygems.org/gems/bcrypt-ruby
+      url: https://rubygems.org/gems/bcrypt
 
     permissions:
       contents: write
@@ -44,12 +44,16 @@ jobs:
           sudo apt install default-jdk maven
           gem update --system
           gem install ruby-maven rake-compiler --no-document
-          rake compile
         if: matrix.ruby == 'jruby'
 
       - name: Install dependencies
         run: bundle install --jobs 4 --retry 3
 
+      - name: Compile on JRuby
+        run: |
+          rake compile
+        if: matrix.ruby == 'jruby'
+
       - name: Publish to RubyGems
         uses: rubygems/release-gem@v1
 
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index c5fb94b..176faa0 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -27,6 +27,10 @@ jobs:
           - { os: ubuntu-latest, ruby: jruby-head }
           - { os: windows-latest, ruby: ucrt }
           - { os: windows-latest, ruby: mingw }
+          - { os: macos-latest, ruby: truffleruby }
+          - { os: ubuntu-latest, ruby: truffleruby }
+          - { os: macos-latest, ruby: truffleruby-head }
+          - { os: ubuntu-latest, ruby: truffleruby-head }
 
     steps:
       - uses: actions/checkout@v4
diff --git a/CHANGELOG b/CHANGELOG
index 1682923..a2c9982 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+3.1.22 Mar 18 2026
+  - [CVE-2026-33306] Fix integer overflow in Java extension
+
 3.1.21 Dec 31 2025
   - Use constant time comparisons
   - Mark as Ractor safe
diff --git a/bcrypt.gemspec b/bcrypt.gemspec
index e35a402..b848c01 100644
--- a/bcrypt.gemspec
+++ b/bcrypt.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt'
-  s.version = '3.1.21'
+  s.version = '3.1.22'
 
   s.summary = "OpenBSD's bcrypt() password hashing algorithm."
   s.description = <<-EOF
diff --git a/ext/jruby/bcrypt_jruby/BCrypt.java b/ext/jruby/bcrypt_jruby/BCrypt.java
index 86db91b..bf987d9 100644
--- a/ext/jruby/bcrypt_jruby/BCrypt.java
+++ b/ext/jruby/bcrypt_jruby/BCrypt.java
@@ -688,20 +688,21 @@ static long roundsForLogRounds(int log_rounds) {
 	 */
 	private byte[] crypt_raw(byte password[], byte salt[], int log_rounds,
 							boolean sign_ext_bug, int safety) {
-		int rounds, i, j;
+		long rounds;
+		int i, j;
 		int cdata[] =  bf_crypt_ciphertext.clone();
 		int clen = cdata.length;
 		byte ret[];
 
 		if (log_rounds < 4 || log_rounds > 31)
 			throw new IllegalArgumentException ("Bad number of rounds");
-		rounds = 1 << log_rounds;
+		rounds = roundsForLogRounds(log_rounds);
 		if (salt.length != BCRYPT_SALT_LEN)
 			throw new IllegalArgumentException ("Bad salt length");
 
 		init_key();
 		ekskey(salt, password, sign_ext_bug, safety);
-		for (i = 0; i < rounds; i++) {
+		for (long r = 0; r < rounds; r++) {
 			key(password, sign_ext_bug, safety);
 			key(salt, false, safety);
 		}