diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index a016f3e16d2f..7d9fce4ee69b 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	mastodon
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.1.1
+DISTVERSION=	4.1.2
 CATEGORIES=	net-im www
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	GNU Social-compatible microblogging server
 WWW=		https://github.com/tootsuite/mastodon
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libidn.so:dns/libidn
 RUN_DEPENDS=	autoconf>=2.71:devel/autoconf \
 		curl>0:ftp/curl \
 		ffmpeg>0:multimedia/ffmpeg \
 		git>=0:devel/git \
 		gmake>0:devel/gmake \
 		gnupg>0:security/gnupg \
 		redis>0:databases/redis \
 		rubygem-bundler>=0:sysutils/rubygem-bundler \
 		sudo>0:security/sudo \
 		wget>0:ftp/wget \
 		yarn>:www/yarn
 
 USES=		magick:7,run pgsql
 USE_GITHUB=	yes
 USE_RC_SUBR=	mastodon_sidekiq mastodon_streaming mastodon_web
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 RM_MASTODONFILES=	.dockerignore dist/mastodon-web.service \
 			dist/mastodon-sidekiq.service \
 			dist/mastodon-streaming.service \
 			docker-compose.yml \
 			Dockerfile \
 			Vagrantfile
 RM_MASTODONDIRS=	.circleci .devcontainer .github
 
 post-extract:
 .for _F in ${RM_MASTODONFILES}
 	@${RM} ${WRKSRC}/${_F}
 .endfor
 .for _D in ${RM_MASTODONDIRS}
 	@${RM} -r ${WRKSRC}/${_D}
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|'\
 		${WRKSRC}/dist/nginx.conf
 
 do-install:
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	${FIND} ${WRKSRC} -name '*.bak' -delete
 	${FIND} ${WRKSRC} -name '*.gitkeep' -delete
 	${FIND} ${WRKSRC} -name '*.gitignore' -delete
 	${MV} ${WRKSRC}/dist/nginx.conf ${WRKSRC}/dist/nginx.conf.sample
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})
 
 post-install:
 	@${ECHO_CMD} "@owner mastodon" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group mastodon" >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${WWWDIR} -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/net-im/mastodon/distinfo b/net-im/mastodon/distinfo
index b9596193ed14..e05722181ee0 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 000000000000..d09e643501f0
--- /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'