diff --git a/lang/ruby27/files/patch-configure.ac b/lang/ruby27/files/patch-configure.ac
index 170a9f3a9fe8..2ad70b2c403a 100644
--- a/lang/ruby27/files/patch-configure.ac
+++ b/lang/ruby27/files/patch-configure.ac
@@ -1,19 +1,27 @@
---- configure.ac.orig	2018-12-28 12:03:09 UTC
+--- configure.ac.orig	2022-04-12 11:25:48 UTC
 +++ configure.ac
-@@ -2678,7 +2678,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
+@@ -2714,7 +2714,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
  			: ${LDSHARED='$(CC) -shared'}
  			AS_IF([test "$rb_cv_binary_elf" = yes], [
  			    LDFLAGS="$LDFLAGS -rdynamic"
 -			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
 +			    DLDFLAGS="$DLDFLAGS "'-Wl,-E'
  			], [
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
  			])
-@@ -3163,6 +3163,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -3200,6 +3200,7 @@ AS_CASE("$enable_shared", [yes], [
      [freebsd*|dragonfly*], [
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
  	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 +	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
  	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
+@@ -3833,6 +3834,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
+     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS)
+ ], [
+     arch="${target_cpu}-${target_os}"
++    AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
+     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
+ ])
+ 
diff --git a/lang/ruby30/files/patch-configure.ac b/lang/ruby30/files/patch-configure.ac
index 3571a89e5cec..44a6172a23f4 100644
--- a/lang/ruby30/files/patch-configure.ac
+++ b/lang/ruby30/files/patch-configure.ac
@@ -1,28 +1,36 @@
 --- configure.ac.orig	2022-04-12 11:48:55 UTC
-+++ configure.ac	2022-04-23
++++ configure.ac
 @@ -1231,7 +1231,7 @@ AC_CHECK_HEADERS(utime.h)
  AC_CHECK_HEADERS(time.h)
  AC_CHECK_HEADERS(ucontext.h)
  AC_CHECK_HEADERS(utime.h)
 -AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [
 +AS_CASE("$target_cpu", [amd64|x64|x86_64|i[3-6]86*], [
    AC_CHECK_HEADERS(x86intrin.h)
  ])
  
 @@ -2825,7 +2825,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
  			: ${LDSHARED='$(CC) -shared'}
  			AS_IF([test "$rb_cv_binary_elf" = yes], [
  			    LDFLAGS="$LDFLAGS -rdynamic"
 -			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
 +			    DLDFLAGS="$DLDFLAGS "'-Wl,-E'
  			], [
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
  			])
 @@ -3324,6 +3324,7 @@ AS_CASE("$enable_shared", [yes], [
      [freebsd*|dragonfly*], [
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
  	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 +	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
  	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
+@@ -3960,6 +3961,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
+     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS)
+ ], [
+     arch="${target_cpu}-${target_os}"
++    AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
+     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
+ ])
+ 
diff --git a/lang/ruby31/files/patch-configure.ac b/lang/ruby31/files/patch-configure.ac
index 620b24f62202..ecaacc2baef2 100644
--- a/lang/ruby31/files/patch-configure.ac
+++ b/lang/ruby31/files/patch-configure.ac
@@ -1,28 +1,36 @@
 --- configure.ac.orig	2022-04-12 11:11:15 UTC
 +++ configure.ac
 @@ -1304,7 +1304,7 @@ AC_CHECK_HEADERS(utime.h)
  AC_CHECK_HEADERS(time.h)
  AC_CHECK_HEADERS(ucontext.h)
  AC_CHECK_HEADERS(utime.h)
 -AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [
 +AS_CASE("$target_cpu", [amd64|x64|x86_64|i[3-6]86*], [
    AC_CHECK_HEADERS(x86intrin.h)
  ])
  RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h)
 @@ -2982,7 +2982,7 @@ STATIC=
  			: ${LDSHARED='$(CC) -shared'}
  			AS_IF([test "$rb_cv_binary_elf" = yes], [
  			    LDFLAGS="$LDFLAGS -rdynamic"
 -			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
 +			    DLDFLAGS="$DLDFLAGS "'-Wl,-E'
  			], [
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
  			])
 @@ -3458,6 +3458,7 @@ AS_CASE("$enable_shared", [yes], [
      [freebsd*|dragonfly*], [
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
  	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 +	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
  	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
+@@ -4103,6 +4104,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
+         arch="${target_cpu}-mingw-ucrt"
+     ], [
+         arch="${target_cpu}-${target_os}"
++	AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
+     ])
+     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
+ ])
diff --git a/lang/ruby32/files/patch-configure.ac b/lang/ruby32/files/patch-configure.ac
index 7740d9d0a1c3..af75b46cc98d 100644
--- a/lang/ruby32/files/patch-configure.ac
+++ b/lang/ruby32/files/patch-configure.ac
@@ -1,28 +1,36 @@
 --- configure.ac.orig	2022-04-03 04:38:31 UTC
 +++ configure.ac
 @@ -1320,7 +1320,7 @@ AC_CHECK_HEADERS(utime.h)
  AC_CHECK_HEADERS(time.h)
  AC_CHECK_HEADERS(ucontext.h)
  AC_CHECK_HEADERS(utime.h)
 -AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [
 +AS_CASE("$target_cpu", [amd64|x64|x86_64|i[3-6]86*], [
    AC_CHECK_HEADERS(x86intrin.h)
  ])
  RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h)
 @@ -3027,7 +3027,7 @@ STATIC=
  			: ${LDSHARED='$(CC) -shared'}
  			AS_IF([test "$rb_cv_binary_elf" = yes], [
  			    LDFLAGS="$LDFLAGS -rdynamic"
 -			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
 +			    DLDFLAGS="$DLDFLAGS "'-Wl,-E'
  			], [
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
  			])
 @@ -3501,6 +3501,7 @@ AS_CASE("$enable_shared", [yes], [
      [freebsd*|dragonfly*], [
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
  	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 +	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
  	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
+@@ -4150,6 +4151,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
+         arch="${target_cpu}-mingw-ucrt"
+     ], [
+         arch="${target_cpu}-${target_os}"
++	AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
+     ])
+     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
+ ])