diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f8ec2b..5dbe266 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ find_program(MSVC cl)
 if(MSVC STREQUAL "MSVC-NOTFOUND")
   message(FATAL_ERROR "MSVC compiler not found")
 endif()
-set(LUAROCKS_VERSION 3.9.2)
+set(LUAROCKS_VERSION 3.11.1)
 set(LUAROCKS_TARBALL luarocks-${LUAROCKS_VERSION}-windows-64.zip)
 
 if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/${LUAROCKS_TARBALL})
diff --git a/LuaJIT b/LuaJIT
index 0d313b2..04dca79 160000
--- a/LuaJIT
+++ b/LuaJIT
@@ -1 +1 @@
-Subproject commit 0d313b243194a0b8d2399d8b549ca5a0ff234db5
+Subproject commit 04dca7911ea255f37be799c18d74c305b921c1a6
diff --git a/WixPatch.xml b/WixPatch.xml
index d4c01ee..50f8a6c 100644
--- a/WixPatch.xml
+++ b/WixPatch.xml
@@ -7,7 +7,21 @@
       Action='set'
       Permanent='no'
       Part='last'
-      Value='[INSTALL_ROOT]bin'
+      Value='[INSTALL_ROOT]bin;[AppDataFolder]luarocks\bin'
+    />
+    <Environment
+      Id='CreateLuaPath'
+      Name='LUA_PATH'
+      Action='create'
+      Permanent='no'
+      Value='[INSTALL_ROOT]bin\lua\?.lua;[INSTALL_ROOT]bin\lua\?\init.lua;[INSTALL_ROOT]bin\?.lua;[INSTALL_ROOT]bin\?\init.lua;[INSTALL_ROOT]bin\..\share\lua\5.1\?.lua;[INSTALL_ROOT]bin\..\share\lua\5.1\?\init.lua;.\?.lua;.\?\init.lua;[AppDataFolder]luarocks\share\lua\5.1\?.lua;[AppDataFolder]luarocks\share\lua\5.1\?\init.lua'
+    />
+    <Environment
+      Id='CreateLuaCPath'
+      Name='LUA_CPATH'
+      Action='create'
+      Permanent='no'
+      Value='[INSTALL_ROOT]bin\?.dll;[INSTALL_ROOT]bin\..\lib\lua\5.1\?.dll;[INSTALL_ROOT]bin\loadall.dll;.\?.dll;[AppDataFolder]luarocks\lib\lua\5.1\?.dll'
     />
     <Environment
       Id='UpdateConfig'