diff --git a/dev-lua/luarocks/luarocks-3.11.1.recipe b/dev-lua/luarocks/luarocks-3.11.1.recipe
index 400a0f9d7..bc432455b 100644
--- a/dev-lua/luarocks/luarocks-3.11.1.recipe
+++ b/dev-lua/luarocks/luarocks-3.11.1.recipe
@@ -4,7 +4,7 @@ packages called rocks, which also contain version dependency information."
 HOMEPAGE="https://luarocks.org"
 COPYRIGHT="2007-2014 Kepler Project"
 LICENSE="MIT"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://luarocks.org/releases/luarocks-$portVersion.tar.gz"
 CHECKSUM_SHA256="c3fb3d960dffb2b2fe9de7e3cb004dc4d0b34bb3d342578af84f84325c669102"
 SOURCE_DIR="luarocks-$portVersion"
@@ -27,7 +27,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:liblua$secondaryArchSuffix >= 5.4
-	devel:liblua$secondaryArchSuffix >= 5.4
+#	devel:liblua$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -50,7 +50,7 @@ BUILD()
 	./configure --prefix=$prefix \
 		--with-lua-include="$(finddir B_SYSTEM_HEADERS_DIRECTORY)$secondaryArchSubDir/lua54" \
 		--sysconfdir=$settingsDir \
-		--rocks-tree=/boot/home/config/non-packaged/data \
+		--rocks-tree=/boot/home/config/non-packaged \
 		--versioned-rocks-dir \
 		--force-config
 	make build
@@ -58,7 +58,7 @@ BUILD()
 
 INSTALL()
 {
-	make BINDIR=$binDir LUADIR=$libDir/lua/5.4 install
+	make bindir=$binDir LUADIR=$libDir/lua/5.4 install
 	ln -s $binDir/luarocks $binDir/luarocks_5.4
 	ln -s $binDir/luarocks_admin $binDir/luarocks_admin_5.4
 }
diff --git a/dev-lua/luarocks/patches/luarocks-3.11.1.patchset b/dev-lua/luarocks/patches/luarocks-3.11.1.patchset
index 1abbf6812..cc902be9c 100644
--- a/dev-lua/luarocks/patches/luarocks-3.11.1.patchset
+++ b/dev-lua/luarocks/patches/luarocks-3.11.1.patchset
@@ -1,4 +1,4 @@
-From 88f0a8cd4109b8b27bdb5a986b05fed33d1894fe Mon Sep 17 00:00:00 2001
+From 1698ff1c00fda00f2469bb1b9d8ef90b00e09d2d Mon Sep 17 00:00:00 2001
 From: Schrijvers Luc <begasus@gmail.com>
 Date: Sat, 8 Jun 2024 17:47:03 +0200
 Subject: Set datarootdir + don't use hard links
@@ -31,5 +31,88 @@ index 9cfd9dd..d420026 100644
           RM = "rm",
           FIND = "find",
 -- 
-2.45.1
+2.45.2
+
+
+From d4411a95d712af61a4cb4f210f90b099a878c4fa Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Fri, 28 Jun 2024 15:38:35 +0200
+Subject: More fixes for share/data directory (found in check on 32bit)
+
+
+diff --git a/spec/init_spec.lua b/spec/init_spec.lua
+index 88bd23a..71322b3 100644
+--- a/spec/init_spec.lua
++++ b/spec/init_spec.lua
+@@ -212,7 +212,7 @@ describe("luarocks init #integration", function()
+          write_file(tmpdir .. "/my_dependency.lua", "return {}", finally)
+ 
+          assert.truthy(run.luarocks("build my_dependency-1.0-1.rockspec"))
+-         assert.truthy(lfs.attributes(myproject .. "/lua_modules/share/lua/" .. test_env.lua_version .."/my_dependency.lua"))
++         assert.truthy(lfs.attributes(myproject .. "/lua_modules/data/lua/" .. test_env.lua_version .."/my_dependency.lua"))
+ 
+          os.remove(rockspec_filename)
+          os.remove("my_dependency-1.0-1.rockspec")
+diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
+index d420026..f931bf0 100644
+--- a/src/luarocks/core/cfg.lua
++++ b/src/luarocks/core/cfg.lua
+@@ -67,7 +67,7 @@ local function detect_sysconfdir()
+       return
+    end
+    -- If installed in a Unix-like tree, use a Unix-like sysconfdir
+-   local installdir = basedir:match("^(.*)[\\/]share[\\/]lua[\\/][^/]*$")
++   local installdir = basedir:match("^(.*)[\\/]data[\\/]lua[\\/][^/]*$")
+    if installdir then
+       if installdir == "/usr" then
+          return "/etc/luarocks"
+@@ -191,7 +191,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
+       cache_timeout = 60,
+       cache_fail_timeout = 86400,
+ 
+-      lua_modules_path = dir.path("share", "lua", lua_version),
++      lua_modules_path = dir.path("data", "lua", lua_version),
+       lib_modules_path = dir.path("lib", "lua", lua_version),
+       rocks_subdir = dir.path("lib", "luarocks", "rocks-"..lua_version),
+ 
+-- 
+2.45.2
+
+
+From 8474a1d43446a3d37ea55956abd89f23e98fb9f3 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Mon, 8 Jul 2024 11:50:43 +0200
+Subject: Adjust paths for headers search
+
+
+diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
+index f931bf0..33326f1 100644
+--- a/src/luarocks/core/cfg.lua
++++ b/src/luarocks/core/cfg.lua
+@@ -272,12 +272,12 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
+       external_deps_subdirs = {
+          bin = "bin",
+          lib = "lib",
+-         include = "include"
++         include = { "develop/headers" , "develop/headers/x86" }
+       },
+       runtime_external_deps_subdirs = {
+          bin = "bin",
+          lib = "lib",
+-         include = "include"
++         include = { "develop/headers" , "develop/headers/x86" }
+       },
+    }
+ 
+@@ -377,7 +377,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
+       defaults.static_lib_extension = "a"
+       defaults.external_lib_extension = "so"
+       defaults.obj_extension = "o"
+-      defaults.external_deps_dirs = { "/usr/local", "/usr", "/" }
++      defaults.external_deps_dirs = { "/usr/local", "/usr", "/" , "/boot/system" }
+ 
+       defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2"
+       -- we pass -fPIC via CFLAGS because of old Makefile-based Lua projects
+-- 
+2.45.2