diff --git a/lang/tolua4/Makefile b/lang/tolua4/Makefile
index 1ed915163b1a..a1660ae94bbf 100644
--- a/lang/tolua4/Makefile
+++ b/lang/tolua4/Makefile
@@ -7,6 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/users/celes/tolua/ \
 		http://www.tecgraf.puc-rio.br/~celes/tolua/
+PKGNAMESUFFIX=	${LUA_VER_STR}
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Tool for easy access of C/C++ code from Lua
@@ -15,8 +16,6 @@ USES=		gmake
 USE_LUA=	4.0
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-LATEST_LINK=	${PORTNAME}${LUA_VER_STR}
-
 NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -Ee \
diff --git a/lang/tolua50/Makefile b/lang/tolua50/Makefile
index 53f08e58d090..5b62d368382f 100644
--- a/lang/tolua50/Makefile
+++ b/lang/tolua50/Makefile
@@ -7,6 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/users/celes/tolua/ \
 		http://www.tecgraf.puc-rio.br/~celes/tolua/
+PKGNAMESUFFIX=	${LUA_VER_STR}
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	toLua: accessing C/C++ code from Lua
@@ -15,8 +16,6 @@ USE_GMAKE=	yes
 USE_LUA=	5.0
 WRKSRC=		${WRKDIR}/${PORTNAME}-5.0
 
-NO_LATEST_LINK=	yes
-
 NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|make|$${MAKE}|' ${WRKSRC}/${MAKEFILE}