diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index fd86a0979acd..fe2cb354c9f3 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -1,70 +1,73 @@
 PORTNAME=	mastodon
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.0.2
+DISTVERSION=	4.1.0
 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
-RM_MASTODONDIRS=	.circleci .github
+			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 8869673daffd..64a87d22eaff 100644
--- a/net-im/mastodon/distinfo
+++ b/net-im/mastodon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669830294
-SHA256 (mastodon-mastodon-v4.0.2_GH0.tar.gz) = 70a4d9dcd9b746f6e9ced9b567ee5ad81e530cfaccb7f471259b917c20166309
-SIZE (mastodon-mastodon-v4.0.2_GH0.tar.gz) = 27934855
+TIMESTAMP = 1678463064
+SHA256 (mastodon-mastodon-v4.1.0_GH0.tar.gz) = 590aee91e7838e32215d599386e1bce26fb15ab8cbeb19301c33057321657d59
+SIZE (mastodon-mastodon-v4.1.0_GH0.tar.gz) = 28475101
diff --git a/net-im/mastodon/pkg-message b/net-im/mastodon/pkg-message
index 492b6a4b7474..b96635f39494 100644
--- a/net-im/mastodon/pkg-message
+++ b/net-im/mastodon/pkg-message
@@ -1,10 +1,22 @@
 [
 { type: install
   message: <<EOM
 ############################################################
 Visit this URL to get started with Mastodon.
 https://wiki.freebsd.org/Ports/net-im/mastodon
 ############################################################
 EOM
 }
+{
+  type: upgrade
+  maximum_version: "4.1.0"
+  message: <<EOM
+############################################################
+Visit this URL to upgrade Mastodon.
+Post installation tasks need to be done according to the
+section Upgrade Procedure - 4.0.2=>4.1.0
+https://wiki.freebsd.org/Ports/net-im/mastodon
+############################################################
+EOM
+}
 ]