2 files changed, 5 insertions, 1 deletions

diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt
index 4babae9b2..db112d557 100644
--- a/lib/lua/CMakeLists.txt
+++ b/lib/lua/CMakeLists.txt
@@ -47,8 +47,12 @@ if (WIN32)
 		)
 	endif()
 
+	set_target_properties(lua PROPERTIES OUTPUT_NAME "lua51")
+
 	# NOTE: The DLL for each configuration is stored at the same place, thus overwriting each other.
-	# This is known, however such behavior is needed for LuaRocks - they always load "lua.dll"
+	# This is known, however such behavior is needed for LuaRocks - they always load "lua5.1.dll" or "lua51.dll"
+	# We make it work by compiling to "lua51.dll" and providing a proxy-DLL "lua5.1.dll"
+	# See http://lua-users.org/wiki/LuaProxyDllFour for details
 else()
 	add_library(lua ${SOURCE})
 endif()
diff --git a/lib/polarssl b/lib/polarssl
-Subproject 2ceda579893ceb23c5eb0d56df47dc235644e0f
+Subproject 2cb1a0c4009ecf368ecc74eb428394e10f9e6d0