diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index a016f3e16d2fd..7d9fce4ee69b4 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mastodon
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.1.1
+DISTVERSION=	4.1.2
 CATEGORIES=	net-im www
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/net-im/mastodon/distinfo b/net-im/mastodon/distinfo
index b9596193ed143..e05722181ee04 100644
--- a/net-im/mastodon/distinfo
+++ b/net-im/mastodon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680176132
-SHA256 (mastodon-mastodon-v4.1.1_GH0.tar.gz) = 579cb28a6f560e32d14a4999dcb3623967b4b1384582b5a56da3c01abf33f712
-SIZE (mastodon-mastodon-v4.1.1_GH0.tar.gz) = 28479814
+TIMESTAMP = 1681401407
+SHA256 (mastodon-mastodon-v4.1.2_GH0.tar.gz) = 12837c7b57acc11ebd24b23a270500c8917459ecdc2a841ba452296b02bcaf29
+SIZE (mastodon-mastodon-v4.1.2_GH0.tar.gz) = 28478833
diff --git a/net-im/mastodon/files/patch-Gemfile b/net-im/mastodon/files/patch-Gemfile
new file mode 100644
index 0000000000000..d09e643501f02
--- /dev/null
+++ b/net-im/mastodon/files/patch-Gemfile
@@ -0,0 +1,20 @@
+--- Gemfile.orig	2023-04-13 16:23:34 UTC
++++ Gemfile
+@@ -1,7 +1,7 @@
+ # frozen_string_literal: true
+ 
+ source 'https://rubygems.org'
+-ruby '>= 2.7.0', '< 3.1.0'
++ruby '>= 2.7.0', '< 3.2.0'
+ 
+ gem 'pkg-config', '~> 1.5'
+ gem 'rexml', '~> 3.2'
+@@ -122,7 +122,7 @@ group :test do
+   gem 'climate_control', '~> 0.2'
+   gem 'faker', '~> 3.1'
+   gem 'json-schema', '~> 3.0'
+-  gem 'rack-test', '~> 2.0'  
++  gem 'rack-test', '~> 2.0'
+   gem 'rails-controller-testing', '~> 1.0'
+   gem 'rspec_junit_formatter', '~> 0.6'
+   gem 'rspec-sidekiq', '~> 3.1'