diff --git a/devel/lua-cjson/Makefile b/devel/lua-cjson/Makefile
index d62d331cd2e..07218839f33 100644
--- a/devel/lua-cjson/Makefile
+++ b/devel/lua-cjson/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2013/03/11 10:50:11 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2013/07/19 12:02:48 jasper Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	JSON support for Lua
 
 DISTNAME=	lua-cjson-2.1.0
+REVISION=	0
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.kyne.com.au/~mark/software/lua-cjson.php
@@ -25,6 +26,8 @@ do-install:
 	${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${MODLUA_DATADIR}/cjson/
 	${INSTALL_PROGRAM} ${WRKSRC}/cjson.so ${MODLUA_LIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/lua/cjson/util.lua ${MODLUA_DATADIR}/cjson/
-	${INSTALL_SCRIPT} ${WRKSRC}/lua/*.lua ${PREFIX}/bin/
+.for s in json2lua lua2json
+	${INSTALL_SCRIPT} ${WRKSRC}/lua/$s.lua ${PREFIX}/bin/$s.lua${MODLUA_VERSION}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/devel/lua-cjson/pkg/PLIST b/devel/lua-cjson/pkg/PLIST
index 9308b77ef0c..9e70df2ddeb 100644
--- a/devel/lua-cjson/pkg/PLIST
+++ b/devel/lua-cjson/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/11/26 09:52:13 jasper Exp $
-bin/json2lua.lua
-bin/lua2json.lua
+@comment $OpenBSD: PLIST,v 1.2 2013/07/19 12:02:48 jasper Exp $
+bin/json2lua.lua${MODLUA_VERSION}
+bin/lua2json.lua${MODLUA_VERSION}
 lib/lua/${MODLUA_VERSION}/cjson.so
 share/lua/${MODLUA_VERSION}/cjson/
 share/lua/${MODLUA_VERSION}/cjson/util.lua