Index: Mk/Uses/lua.mk
===================================================================
--- Mk/Uses/lua.mk
+++ Mk/Uses/lua.mk
@@ -77,13 +77,16 @@
 #
 LUA_VER_STR=		${_LUA_WANTED_VERSION}
 LUA_VER=		${_LUA_WANTED_VERSION:S/5/5./}
-LUA_CMD=		lua${_LUA_WANTED_VERSION}
-LUAC_CMD=		luac${_LUA_WANTED_VERSION}
-LUA_INCDIR=		${LOCALBASE}/include/lua${_LUA_WANTED_VERSION}
-LUA_MODLIBDIR=		${LOCALBASE}/lib/lua/${LUA_VER}
-LUA_MODSHAREDIR=	${LOCALBASE}/share/lua/${LUA_VER}
+LUA_CMD=		${PORTNAME}${_LUA_WANTED_VERSION}
+LUAC_CMD=		${PORTNAME}c${_LUA_WANTED_VERSION}
+LUA_INCDIR=		${LOCALBASE}/include/${PORTNAME}${_LUA_WANTED_VERSION}
+LUA_MODLIBDIR=		${LOCALBASE}/lib/${PORTNAME}/${LUA_VER}
+LUA_MODSHAREDIR=	${LOCALBASE}/share/${PORTNAME}/${LUA_VER}
 LUA_LIBDIR=		${LOCALBASE}/lib
-LUA_PKGNAMEPREFIX=	lua${LUA_VER_STR}-
+LUA_PKGNAMEPREFIX=	${PORTNAME}${LUA_VER_STR}-
+LUA_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
+LUA_INCDIR=	${LUA_PREFIX}/include/${LUA_SUBDIR}
+LUA_LIBDIR=	${LUA_PREFIX}/lib
 
 PLIST_SUB+=	LUA_MODLIBDIR=${LUA_MODLIBDIR:S,^${LOCALBASE}/,,} \
 		LUA_MODSHAREDIR=${LUA_MODSHAREDIR:S,^${LOCALBASE}/,,} \
Index: Mk/bsd.default-versions.mk
===================================================================
--- Mk/bsd.default-versions.mk
+++ Mk/bsd.default-versions.mk
@@ -55,7 +55,7 @@
 WARNING+=		"OVERRIDE_LINUX_BASE_PORT is deprecated, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}."
 .endif
 # Possible values: 5.1, 5.2, 5.3
-LUA_DEFAULT?=		5.2
+LUA_DEFAULT?=		5.3
 # Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 5.5p, 5.6p, 5.7p, 5.6w
 MYSQL_DEFAULT?=		5.6
 # Possible values: 5.22, 5.24, 5.26, devel