diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index ab3d0c75667e..a9399568005a 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.7.21
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.7
 PKGNAMESUFFIX?=	57-server
diff --git a/databases/mysql57-server/files/mysql-server.in b/databases/mysql57-server/files/mysql-server.in
index cafd13f414aa..d33cd12c2a5c 100644
--- a/databases/mysql57-server/files/mysql-server.in
+++ b/databases/mysql57-server/files/mysql-server.in
@@ -47,6 +47,10 @@ fi
 if [ ! -z "${mysql_optfile}" ]; then
 mysql_extra="--defaults-extra-file=${mysql_optfile}"
 fi
+if [ "${mysql_limits}" = "NO" ]; then
+mysql_limits=""
+fi
+
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
@@ -70,7 +74,7 @@ mysql_prestart()
 	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
 		mysql_create_auth_tables || return 1
 	fi
-	if checkyesno mysql_limits; then
+	if [ -z "$mysql_limits" ] || checkyesno mysql_limits; then
 		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
 	else
 		return 0