diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index 9a1c13a6c3b5..58a046bd0063 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	tarantool
-PORTVERSION=	3.0.0
+PORTVERSION=	3.1.1
 CATEGORIES=	databases
 MASTER_SITES=	https://download.tarantool.org/tarantool/src/
 
 MAINTAINER=	balaev@tarantool.org
 COMMENT=	NoSQL database running in a Lua application server
 WWW=		https://tarantool.io/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=		armv6 i386 powerpc64
 NOT_FOR_ARCHS_REASON=	fails to build: Unsupported architecture
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
 		msgpuck>=2.0_6:devel/msgpuck \
 		curl>=8.4.0:ftp/curl
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicui18n.so:devel/icu \
 		libmsgpuck.so:devel/msgpuck \
 		libyaml.so:textproc/libyaml \
 		libzstd.so:archivers/zstd
 
 USES=		cmake:noninja compiler:c++11-lang cpe gettext-runtime gmake iconv perl5 readline ssl
 USE_PERL5=	build
 
 CONFLICTS_INSTALL=	tarantool2
 
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 CMAKE_ARGS=	-DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 		-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man
 CMAKE_OFF=	ENABLE_BUNDLED_LIBCURL \
 		ENABLE_BUNDLED_LIBYAML \
 		ENABLE_BUNDLED_MSGPUCK \
 		ENABLE_BUNDLED_ZSTD
 CMAKE_ON=	ENABLE_DIST
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	tarantool
 
 USERS=		tarantool
 GROUPS=		tarantool
 
 PLIST_SUB=	TT_DATADIR=${TT_DATADIR} \
 		TT_LOGDIR=${TT_LOGDIR}
 SUB_FILES=	pkg-message
 
 TT_DATADIR?=	/var/db/tarantool
 TT_LOGDIR?=	/var/log/tarantool
 TT_RUNDIR?=	/var/run/tarantool
 
 post-patch:
 	@${ECHO_CMD} ${PORTVERSION}-0 > ${WRKSRC}/VERSION
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/tarantool/
+	@${RMDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/databases/tarantool/distinfo b/databases/tarantool/distinfo
index 0004384a9081..be7670db78d3 100644
--- a/databases/tarantool/distinfo
+++ b/databases/tarantool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1703671142
-SHA256 (tarantool-3.0.0.tar.gz) = 41dee7d752839e47b55dafeca424937e15be2d72d5a002ccc3b7f23dc8dbee3f
-SIZE (tarantool-3.0.0.tar.gz) = 43019938
+TIMESTAMP = 1723625416
+SHA256 (tarantool-3.1.1.tar.gz) = 705aeeac16b26ab7b06c6acb418ae22c5367665dcdccc28d577271fddd78a1e6
+SIZE (tarantool-3.1.1.tar.gz) = 32789262
diff --git a/databases/tarantool/pkg-plist b/databases/tarantool/pkg-plist
index a2407ad3e082..81eeaae7337d 100644
--- a/databases/tarantool/pkg-plist
+++ b/databases/tarantool/pkg-plist
@@ -1,111 +1,10 @@
 bin/tarantool
-bin/tarantoolctl
-etc/tarantool/default/tarantool
-etc/tarantool/instances.available/example.lua
 include/tarantool/lauxlib.h
 include/tarantool/lmisclib.h
 include/tarantool/lua.h
 include/tarantool/lua.hpp
 include/tarantool/luaconf.h
 include/tarantool/luajit.h
 include/tarantool/lualib.h
 include/tarantool/module.h
 share/man/man1/tarantool.1.gz
-share/man/man1/tarantoolctl.1.gz
-%%DATADIR%%/luarocks/admin/cache.lua
-%%DATADIR%%/luarocks/admin/cmd/add.lua
-%%DATADIR%%/luarocks/admin/cmd/make_manifest.lua
-%%DATADIR%%/luarocks/admin/cmd/refresh_cache.lua
-%%DATADIR%%/luarocks/admin/cmd/remove.lua
-%%DATADIR%%/luarocks/admin/index.lua
-%%DATADIR%%/luarocks/argparse.lua
-%%DATADIR%%/luarocks/build.lua
-%%DATADIR%%/luarocks/build/builtin.lua
-%%DATADIR%%/luarocks/build/cmake.lua
-%%DATADIR%%/luarocks/build/command.lua
-%%DATADIR%%/luarocks/build/make.lua
-%%DATADIR%%/luarocks/cmd.lua
-%%DATADIR%%/luarocks/cmd/build.lua
-%%DATADIR%%/luarocks/cmd/config.lua
-%%DATADIR%%/luarocks/cmd/doc.lua
-%%DATADIR%%/luarocks/cmd/download.lua
-%%DATADIR%%/luarocks/cmd/init.lua
-%%DATADIR%%/luarocks/cmd/install.lua
-%%DATADIR%%/luarocks/cmd/lint.lua
-%%DATADIR%%/luarocks/cmd/list.lua
-%%DATADIR%%/luarocks/cmd/make.lua
-%%DATADIR%%/luarocks/cmd/new_version.lua
-%%DATADIR%%/luarocks/cmd/pack.lua
-%%DATADIR%%/luarocks/cmd/path.lua
-%%DATADIR%%/luarocks/cmd/purge.lua
-%%DATADIR%%/luarocks/cmd/remove.lua
-%%DATADIR%%/luarocks/cmd/search.lua
-%%DATADIR%%/luarocks/cmd/show.lua
-%%DATADIR%%/luarocks/cmd/test.lua
-%%DATADIR%%/luarocks/cmd/unpack.lua
-%%DATADIR%%/luarocks/cmd/upload.lua
-%%DATADIR%%/luarocks/cmd/which.lua
-%%DATADIR%%/luarocks/cmd/write_rockspec.lua
-%%DATADIR%%/luarocks/core/cfg.lua
-%%DATADIR%%/luarocks/core/dir.lua
-%%DATADIR%%/luarocks/core/hardcoded.lua
-%%DATADIR%%/luarocks/core/manif.lua
-%%DATADIR%%/luarocks/core/path.lua
-%%DATADIR%%/luarocks/core/persist.lua
-%%DATADIR%%/luarocks/core/sysdetect.lua
-%%DATADIR%%/luarocks/core/util.lua
-%%DATADIR%%/luarocks/core/vers.lua
-%%DATADIR%%/luarocks/deplocks.lua
-%%DATADIR%%/luarocks/deps.lua
-%%DATADIR%%/luarocks/dir.lua
-%%DATADIR%%/luarocks/download.lua
-%%DATADIR%%/luarocks/fetch.lua
-%%DATADIR%%/luarocks/fetch/cvs.lua
-%%DATADIR%%/luarocks/fetch/git.lua
-%%DATADIR%%/luarocks/fetch/git_file.lua
-%%DATADIR%%/luarocks/fetch/git_http.lua
-%%DATADIR%%/luarocks/fetch/git_https.lua
-%%DATADIR%%/luarocks/fetch/git_ssh.lua
-%%DATADIR%%/luarocks/fetch/hg.lua
-%%DATADIR%%/luarocks/fetch/hg_http.lua
-%%DATADIR%%/luarocks/fetch/hg_https.lua
-%%DATADIR%%/luarocks/fetch/hg_ssh.lua
-%%DATADIR%%/luarocks/fetch/sscm.lua
-%%DATADIR%%/luarocks/fetch/svn.lua
-%%DATADIR%%/luarocks/fs.lua
-%%DATADIR%%/luarocks/fs/lua.lua
-%%DATADIR%%/luarocks/fs/tools.lua
-%%DATADIR%%/luarocks/fs/macosx.lua
-%%DATADIR%%/luarocks/fs/unix.lua
-%%DATADIR%%/luarocks/fs/unix/tools.lua
-%%DATADIR%%/luarocks/fs/win32.lua
-%%DATADIR%%/luarocks/fs/win32/tools.lua
-%%DATADIR%%/luarocks/fun.lua
-%%DATADIR%%/luarocks/loader.lua
-%%DATADIR%%/luarocks/manif.lua
-%%DATADIR%%/luarocks/manif/writer.lua
-%%DATADIR%%/luarocks/pack.lua
-%%DATADIR%%/luarocks/path.lua
-%%DATADIR%%/luarocks/persist.lua
-%%DATADIR%%/luarocks/queries.lua
-%%DATADIR%%/luarocks/remove.lua
-%%DATADIR%%/luarocks/repos.lua
-%%DATADIR%%/luarocks/require.lua
-%%DATADIR%%/luarocks/results.lua
-%%DATADIR%%/luarocks/rockspecs.lua
-%%DATADIR%%/luarocks/search.lua
-%%DATADIR%%/luarocks/signing.lua
-%%DATADIR%%/luarocks/test.lua
-%%DATADIR%%/luarocks/test/busted.lua
-%%DATADIR%%/luarocks/test/command.lua
-%%DATADIR%%/luarocks/tools/patch.lua
-%%DATADIR%%/luarocks/tools/tar.lua
-%%DATADIR%%/luarocks/tools/zip.lua
-%%DATADIR%%/luarocks/type/manifest.lua
-%%DATADIR%%/luarocks/type/rockspec.lua
-%%DATADIR%%/luarocks/type_check.lua
-%%DATADIR%%/luarocks/upload/api.lua
-%%DATADIR%%/luarocks/upload/multipart.lua
-%%DATADIR%%/luarocks/util.lua
-@dir(tarantool,tarantool,) %%TT_DATADIR%%
-@dir(tarantool,tarantool,) %%TT_LOGDIR%%