diff --git a/dev-lang/lua/lua-5.2.3.recipe b/dev-lang/lua/lua52-5.2.4.recipe
similarity index 75%
rename from dev-lang/lua/lua-5.2.3.recipe
rename to dev-lang/lua/lua52-5.2.4.recipe
index eb40f62cb..6200843f2 100644
--- a/dev-lang/lua/lua-5.2.3.recipe
+++ b/dev-lang/lua/lua52-5.2.4.recipe
@@ -8,19 +8,19 @@ collection, making it ideal for configuration, scripting, and rapid prototyping.
 HOMEPAGE="http://www.lua.org"
 COPYRIGHT="1994-2012, Lua.org, PUC-Rio"
 LICENSE="MIT"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
-CHECKSUM_SHA256="13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d"
+CHECKSUM_SHA256="b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b"
+SOURCE_DIR="lua-$portVersion"
 PATCHES="lua-$portVersion.patchset"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	lua$secondaryArchSuffix = $portVersion compat >= 5.2
-	cmd:lua$secondaryArchSuffix = $portVersion compat >= 5.2
+	lua52$secondaryArchSuffix = $portVersion compat >= 5.2
 	cmd:lua5.2$secondaryArchSuffix = $portVersion compat >= 5.2
-	cmd:luac$secondaryArchSuffix = $portVersion compat >= 5.2
+	cmd:luac5.2$secondaryArchSuffix = $portVersion compat >= 5.2
 	lib:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
 	"
 REQUIRES="
@@ -28,12 +28,15 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	lua${secondaryArchSuffix}_devel = $portVersion compat >= 5.2
+	lua52${secondaryArchSuffix}_devel = $portVersion compat >= 5.2
 	devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
 	devel:liblua52$secondaryArchSuffix = $portVersion compat >= 5.2
 	"
 REQUIRES_devel="
-	lua$secondaryArchSuffix == $portVersion
+	lua52$secondaryArchSuffix == $portVersion
+	"
+CONFLICTS_devel="
+	lua${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
@@ -52,11 +55,14 @@ INSTALL()
 		INSTALL_INC="$includeDir/lua52" INSTALL_LMOD="$dataDir/lua/5.2" \
 		INSTALL_LIB="$libDir" INSTALL_BIN="$binDir"
 
-	ln -s liblua.so $libDir/liblua.so.5.2
-	ln -s liblua.a $libDir/liblua52.a
+	mv $libDir/liblua.so $libDir/liblua.so.5.2
+	mv $libDir/liblua.a $libDir/liblua52.a
+	ln -s liblua.so.5.2 $libDir/liblua.so
 
 	mv $binDir/lua $binDir/lua5.2
-	ln -s $binDir/lua5.2 $binDir/lua
+	mv $binDir/luac $binDir/luac5.2
+	mv $manDir/man1/lua.1 $manDir/man1/lua52.1
+	mv $manDir/man1/luac.1 $manDir/man1/luac52.1
 
 	mkdir -p $developLibDir/pkgconfig
 	cat > $developLibDir/pkgconfig/lua.pc << EOF
diff --git a/dev-lang/lua/patches/lua-5.2.3.patchset b/dev-lang/lua/patches/lua-5.2.4.patchset
similarity index 100%
rename from dev-lang/lua/patches/lua-5.2.3.patchset
rename to dev-lang/lua/patches/lua-5.2.4.patchset