diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index 380d47cd5349..bb8d528bd630 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tarantool
-PORTVERSION=	1.5.1
-PORTREVISION=	2
+PORTVERSION=	1.5.3
 CATEGORIES=	databases
 MASTER_SITES=	http://tarantool.org/dist/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${TR_REV}-src
@@ -13,17 +12,17 @@ COMMENT=	High performance key/value storage server
 
 LICENSE=	BSD
 
-TR_REV=		248-g1f7eab2
+TR_REV=		102-g2857a4e
 MAKE_JOBS_UNSAFE=yes
 USES=		cmake gettext:build gmake iconv perl5 compiler:c++11-lang
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
-CMAKE_ARGS=	-DCMAKE_MAN_DIR=man \
-		-DCMAKE_SYSCONF_DIR=${ETCDIR} \
+CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=man \
+		-DCMAKE_INSTALL_SYSCONFDIR=${ETCDIR} \
 		-DCMAKE_LOCALSTATE_DIR=${DATADIR}
 
-OPTIONS_DEFINE=	CLIENT
+OPTIONS_DEFINE=	CLIENT DEBUG
 OPTIONS_GROUP=	PLUGINS
 OPTIONS_GROUP_PLUGINS=	MYSQL PGSQL
 PLUGINS_DESC=	Plugins list
@@ -32,7 +31,7 @@ DEBUG_DESC=	Enable debug
 MYSQL_DESC=	Install MySQL plugin
 PGSQL_DESC=	Install PostgreSQL plugin
 
-OPTIONS_DEFAULT=CLIENT
+OPTIONS_DEFAULT=CLIENT MYSQL
 
 .include <bsd.port.options.mk>
 
@@ -75,4 +74,8 @@ PLIST_SUB+=	PLUGINS=""
 PLIST_SUB+=	PLUGINS="@comment "
 .endif
 
+.if ${OSVERSION} < 900000
+BROKEN=		Does not build on FreeBSD < 9.0
+.endif
+
 .include <bsd.port.mk>
diff --git a/databases/tarantool/distinfo b/databases/tarantool/distinfo
index 4a0be4d8eecc..ee7a19b21292 100644
--- a/databases/tarantool/distinfo
+++ b/databases/tarantool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tarantool-1.5.1-248-g1f7eab2-src.tar.gz) = 7586ceaba1528e690220b9504222434f6d2dd249b709356f8be015a0eeb262d0
-SIZE (tarantool-1.5.1-248-g1f7eab2-src.tar.gz) = 2816462
+SHA256 (tarantool-1.5.3-102-g2857a4e-src.tar.gz) = 288f22f01d0f0c295902380c6a57531237cc4732b6b124e6344da89b89ee77c3
+SIZE (tarantool-1.5.3-102-g2857a4e-src.tar.gz) = 2928105
diff --git a/databases/tarantool/files/patch-CMakeLists.txt b/databases/tarantool/files/patch-CMakeLists.txt
deleted file mode 100644
index afd67964cc6e..000000000000
--- a/databases/tarantool/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2013-11-22 16:46:37.651143426 +0400
-+++ CMakeLists.txt	2013-11-22 16:50:55.948120860 +0400
-@@ -147,7 +147,7 @@ if (NOT DEFINED CMAKE_SYSCONF_DIR)
-     set (CMAKE_SYSCONF_DIR "etc")
- endif()
- if (NOT DEFINED CMAKE_LOCALSTATE_DIR)
--    set (CMAKE_LOCALSTATE_DIR "var")
-+    set (CMAKE_LOCALSTATE_DIR "var/lib/tarantool")
- endif()
- if (NOT DEFINED CMAKE_MAN_DIR)
-     set (CMAKE_MAN_DIR "man")
diff --git a/databases/tarantool/pkg-plist b/databases/tarantool/pkg-plist
index 748beddfaeac..d2efecaaa8bd 100644
--- a/databases/tarantool/pkg-plist
+++ b/databases/tarantool/pkg-plist
@@ -3,6 +3,13 @@ bin/tarantar
 bin/tarantool_box
 %%CLIENT%%bin/tarantool
 %%ETCDIR%%/tarantool.cfg.sample
+include/tarantool/config.h
+include/tarantool/lauxlib.h
+include/tarantool/lua.h
+include/tarantool/lua.hpp
+include/tarantool/luaconf.h
+include/tarantool/luajit.h
+include/tarantool/lualib.h
 include/tarantool/tnt.h
 include/tarantool/tnt_buf.h
 include/tarantool/tnt_call.h
@@ -32,33 +39,38 @@ include/tarantool/tnt_tuple.h
 include/tarantool/tnt_update.h
 include/tarantool/tnt_utf8.h
 include/tarantool/tnt_xlog.h
-lib/libtarantoolnet.so.1.1
-lib/libtarantoolrpl.so.1
+lib/libtarantool.a
+lib/libtarantool.so
+lib/libtarantool.so.1
+lib/libtarantool.so.1.1
 lib/libtarantoolnet.a
 lib/libtarantoolnet.so
-lib/libtarantool.a
 lib/libtarantoolnet.so.1
-lib/libtarantoolrpl.so
-lib/libtarantoolsql.so.1.1
-lib/libtarantoolsql.a
-lib/libtarantoolsql.so.1
-lib/libtarantoolrpl.so.1.1
-lib/libtarantool.so.1
-lib/libtarantoolsql.so
-lib/libtarantool.so.1.1
-lib/libtarantool.so
+lib/libtarantoolnet.so.1.1
 lib/libtarantoolrpl.a
-%%MYSQL%%lib/tarantool/plugins/libmysql.so
-%%PGSQL%%lib/tarantool/plugins/libpg.so
+lib/libtarantoolrpl.so
+lib/libtarantoolrpl.so.1
+lib/libtarantoolrpl.so.1.1
+lib/libtarantoolsql.a
+lib/libtarantoolsql.so
+lib/libtarantoolsql.so.1
+lib/libtarantoolsql.so.1.1
+lib/tarantool/box/sophia.so
+%%MYSQL%%lib/tarantool/box/net/mysql.so
+%%PGSQL%%lib/tarantool/box/net/pg.so
 %%CLIENT%%man/man1/tarantool.1.gz
 man/man1/tarantool_box.1.gz
 %%DOCSDIR%%/README.md
 %%DOCSDIR%%/box-protocol.txt
 %%DOCSDIR%%/LICENSE
 %%DATADIR%%/00000000000000000001.snap
+%%DATADIR%%/box/net/sql.lua
 @dirrmtry %%ETCDIR%%
 @dirrm include/tarantool
-%%PLUGINS%%@dirrm lib/tarantool/plugins
-%%PLUGINS%%@dirrm lib/tarantool
+%%PLUGINS%%@dirrm lib/tarantool/box/net
+@dirrm lib/tarantool/box
+@dirrm lib/tarantool
 @dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/box/net
+@dirrm %%DATADIR%%/box
 @dirrm %%DATADIR%%