diff --git a/changes.txt b/changes.txt
index 849ef40b8..66c6b9a35 100644
--- a/changes.txt
+++ b/changes.txt
@@ -8,6 +8,7 @@ Released: N/A
   * Fixed Shader:send and Shader:sendColor ignoring the last argument for an array.
   * Fixed a crash when love.graphics.pop is called after a love.window.setMode while the transformation stack was not empty.
   * Fixed BezierCurves to error instead of hanging in some situations.
+  * Fixed compilation of luasocket with newer luajit 2.1.0 beta versions.
 
   * Improved command line argument handling.
   * Improved seeking support, especially for short video files.
diff --git a/src/libraries/luasocket/libluasocket/lua.h b/src/libraries/luasocket/libluasocket/lua.h
index a280df842..c4215ecb7 100644
--- a/src/libraries/luasocket/libluasocket/lua.h
+++ b/src/libraries/luasocket/libluasocket/lua.h
@@ -6,9 +6,12 @@
 #include <lualib.h>
 #include <lauxlib.h>
 
-#if LUA_VERSION_NUM > 501
+#if LUA_VERSION_NUM >= 501
+#	undef luaL_reg
 #	define luaL_reg luaL_Reg
+#	undef luaL_putchar
 #	define luaL_putchar(B, c) luaL_addchar(B, c)
+#	undef luaL_typerror
 #	define luaL_typerror(L, n, t) luax_typerror(L, n, t)
 
 extern int luax_typerror(lua_State *L, int narg, const char *type);