diff --git a/srcpkgs/lua-cjson/template b/srcpkgs/lua-cjson/template
index b9617715c44..b2703270328 100644
--- a/srcpkgs/lua-cjson/template
+++ b/srcpkgs/lua-cjson/template
@@ -2,12 +2,11 @@
 pkgname=lua-cjson
 version=2.1.0
 revision=1
-build_style=gnu-makefile
+create_wrksrc=yes
 hostmakedepends="lua lua51 lua52"
 makedepends="lua-devel lua51-devel lua52-devel"
 depends="lua>=5.3"
-_desc="JSON support for Lua"
-short_desc="${_desc} (5.3)"
+short_desc="JSON support for Lua"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="MIT"
 homepage="http://www.kyne.com.au/~mark/software/lua-cjson.php"
@@ -15,50 +14,38 @@ distfiles="http://www.kyne.com.au/~mark/software/download/${pkgname}-${version}.
 checksum=51bc69cd55931e0cba2ceae39e9efa2483f4292da3a88a1ed470eda829f6c778
 
 post_extract() {
-	mkdir -p lua51
-	mv * lua51 || true
+	mv "lua-cjson-${version}" lua51
 	cp -a lua51 lua52
 	cp -a lua51 lua53
 }
-
 do_build() {
-	cd ${wrksrc}/lua51
-	make
-
-	cd ${wrksrc}/lua52
-	make
-
-	cd ${wrksrc}/lua53
-	make
+	for x in lua51 lua52 lua53; do
+		make -C "$x" \
+			CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+			LUA_VERSION="5.${x#lua5}" USE_INTERNAL_FPCONV=1 \
+			LUA_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include/lua5.${x#lua5}"
+	done
 }
-
 do_install() {
-	cd ${wrksrc}/lua51
-	vinstall cjson.so 755 usr/lib/lua/5.1
-
-	cd ${wrksrc}/lua52
-	vinstall cjson.so 755 usr/lib/lua/5.2
-
-	cd ${wrksrc}/lua53
-	vinstall cjson.so 755 usr/lib/lua/5.3
-	vlicense LICENSE
+	for x in lua51 lua52 lua53; do
+		vinstall "$x/cjson.so" 755 "usr/lib/lua/5.${x#lua5}"
+	done
+	vlicense lua53/LICENSE
 }
 
 lua51-cjson_package() {
 	depends="lua51"
-	short_desc="${_desc} (5.1)"
+	short_desc+=" (5.1)"
 	pkg_install() {
 		vmove usr/lib/lua/5.1
 		vlicense ${wrksrc}/lua51/LICENSE
 	}
 }
-
 lua52-cjson_package() {
 	depends="lua52"
-	short_desc="${_desc} (5.2)"
+	short_desc+=" (5.2)"
 	pkg_install() {
 		vmove usr/lib/lua/5.2
 		vlicense ${wrksrc}/lua52/LICENSE
 	}
 }
-