diff --git a/lang/ruby/3.1/Makefile b/lang/ruby/3.1/Makefile
index b965acb4ca3..fb8c3f62f03 100644
--- a/lang/ruby/3.1/Makefile
+++ b/lang/ruby/3.1/Makefile
@@ -4,8 +4,18 @@ SHARED_LIBS =		ruby31	0.0
 NEXTVER =		3.2
 PKGSPEC-main ?=         ruby->=3.1.0,<${NEXTVER}
 
+REVISION-main =		0
+
+MASTER_SITES1 ?=	https://github.com/ruby/openssl/commit/
+
 # Backport fix for fixnum*fixnum multiplication on octeon
 PATCHFILES =		ruby-octeon-fix{fe6245b4309c855e6aca5b786ad50a72d53d278a}.patch:0
+# Backport fix for ASN.1 time test
+PATCHFILES +=		ruby-asn1time-fix{bbc540fe83195e2a54cf40fab448cea2afe4df1d}.patch:1
+# Enable HKDF
+PATCHFILES +=		ruby-enable-hkdf{9bdd39a7e2a5851c9090889727f54859e63a4ec9}.patch:1
+# Fix Ed25519 support
+PATCHFILES +=		ruby-ed25519-fix{475b2bf766d6093370e49abd5dce5436cc0034ca}.patch:1
 
 PSEUDO_FLAVORS=		no_ri_docs bootstrap
 # Do not build the RI docs on slow arches
diff --git a/lang/ruby/3.1/distinfo b/lang/ruby/3.1/distinfo
index 1e038cad558..37971472933 100644
--- a/lang/ruby/3.1/distinfo
+++ b/lang/ruby/3.1/distinfo
@@ -1,4 +1,10 @@
 SHA256 (ruby-3.1.3.tar.gz) = XqSYo19M0Vh1IApS3eQrbrF54SZOF9eHMsOlfNHGq54=
+SHA256 (ruby-asn1time-fix.patch) = IFBYT7Yksks4N6VH5iAN3MjU+ag8wJS1RUaNUEm8rFA=
+SHA256 (ruby-ed25519-fix.patch) = hTjqj6BwVhNlUMutAHJ48TKhcWJR8UJNNp9p64d7Mgo=
+SHA256 (ruby-enable-hkdf.patch) = 9/thoWkaa8EmvjppRKRtpE510mVPTmxeRcwHMyxNVqw=
 SHA256 (ruby-octeon-fix.patch) = qFc5PJPaBF1ly9Kr9hXaQIYLmPPyUUw7ThMTkfE6y3A=
 SIZE (ruby-3.1.3.tar.gz) = 20906051
+SIZE (ruby-asn1time-fix.patch) = 2277
+SIZE (ruby-ed25519-fix.patch) = 1494
+SIZE (ruby-enable-hkdf.patch) = 1469
 SIZE (ruby-octeon-fix.patch) = 1880
diff --git a/lang/ruby/3.1/patches/patch-configure b/lang/ruby/3.1/patches/patch-configure
index a7115fddb90..0cd7e1d0af2 100644
--- a/lang/ruby/3.1/patches/patch-configure
+++ b/lang/ruby/3.1/patches/patch-configure
@@ -1,3 +1,5 @@
+Support arm64 coroutines.
+
 Set correct shared library name.
 
 Override the arch setting to remove OpenBSD version from it,
@@ -6,7 +8,18 @@ so ports don't have to be bumped when OpenBSD version changes.
 Index: configure
 --- configure.orig
 +++ configure
-@@ -31793,7 +31793,7 @@ fi
+@@ -29533,6 +29533,10 @@ esac
+ 
+             coroutine_type=x86
+          ;; #(
++  aarch64-openbsd*) :
++
++            coroutine_type=arm64
++         ;; #(
+   *-openbsd*) :
+ 
+             coroutine_type=pthread
+@@ -31793,7 +31797,7 @@ fi
  	 ;; #(
    openbsd*|mirbsd*) :
  
@@ -15,7 +28,7 @@ Index: configure
  	 ;; #(
    solaris*) :
  
-@@ -33495,7 +33495,7 @@ then :
+@@ -33495,7 +33499,7 @@ then :
  
  else $as_nop