diff --git a/.gitignore b/.gitignore
index ac39835..7fbd5b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,8 @@
 lualock
 apidocs/
 apidocs/*
+
+# Temporary files
+*swp
+*swo
+*~
diff --git a/Makefile b/Makefile
index f5e6a1f..96d5147 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ PKGS := gtk+-3.0 lua oocairo xscrnsaver x11
 INCS := $(shell pkg-config --cflags $(PKGS))
 LIBS := $(shell pkg-config --libs $(PKGS)) -lpam
 
-CFLAGS   := -Wall -Wextra -std=gnu99 -I. $(INCS) $(CFLAGS)
+CFLAGS   := -Wall -Wextra -std=gnu99 -I. $(INCS) -D LUA_COMPAT_MODULE $(CFLAGS)
 CPPFLAGS := -DLUALOCK_INSTALL_DIR=\"$(INSTALLDIR)/share/lualock\"  \
 			-DLUALOCK_DATA_DIR=\"$(INSTALLDIR)/share/lualock/data\" $(CPPFLAGS)
 DEBUG    := -g -DDEBUG
diff --git a/clib/cairo_surface.c b/clib/cairo_surface.c
index d2b5e45..f513f0f 100644
--- a/clib/cairo_surface.c
+++ b/clib/cairo_surface.c
@@ -1,3 +1,4 @@
+#define luaL_register(L,n,l)    (luaL_openlib(L,(n),(l),0))
 #include <cairo.h>
 #include <oocairo.h>
 
@@ -52,7 +53,7 @@ static gint lualock_lua_cairo_surface_resize(lua_State *L) {
 }
 
 void lualock_lua_cairo_surface_init(lua_State *L) {
-    const struct luaL_reg lualock_cairo_surface_lib[] =
+    const struct luaL_Reg lualock_cairo_surface_lib[] =
     {
         { "show", lualock_lua_cairo_surface_show },
         { "get_surface", lualock_lua_cairo_surface_get_surface },
diff --git a/clib/hook.c b/clib/hook.c
index c5daa93..84f5757 100644
--- a/clib/hook.c
+++ b/clib/hook.c
@@ -16,6 +16,7 @@
 //      MA 02110-1301, USA.
 //
 
+#define luaL_register(L,n,l)    (luaL_openlib(L,(n),(l),0))
 #include <lauxlib.h>
 #include <string.h>
 
@@ -55,7 +56,7 @@ static gint lualock_lua_hook_connect(lua_State *L) {
 }
 
 void lualock_lua_hook_init(lua_State *L) {
-    const struct luaL_reg lualock_hook_lib[] = {
+    const struct luaL_Reg lualock_hook_lib[] = {
         { "connect", lualock_lua_hook_connect },
         { NULL, NULL }
     };
diff --git a/clib/image.c b/clib/image.c
index 73b0473..9e37e67 100644
--- a/clib/image.c
+++ b/clib/image.c
@@ -240,7 +240,7 @@ static gint lualock_lua_image_get_surface(lua_State *L) {
 }
 
 void lualock_lua_image_init(lua_State *L) {
-    const struct luaL_reg lualock_image_lib[] =
+    const struct luaL_Reg lualock_image_lib[] =
     {
         { "show", lualock_lua_image_show },
         { "hide", lualock_lua_image_hide },
@@ -258,7 +258,7 @@ void lualock_lua_image_init(lua_State *L) {
     lua_pushvalue(L, -1);
     lua_setfield(L, -2, "__index");
     
-    luaL_register(L, NULL, lualock_image_lib);
+    luaL_setfuncs(L, lualock_image_lib, 0);
     lua_register(L, "image", lualock_lua_image_new);
     lua_pop(L, 1);
 }
diff --git a/clib/timer.c b/clib/timer.c
index a9d8b09..0501c8d 100644
--- a/clib/timer.c
+++ b/clib/timer.c
@@ -16,6 +16,7 @@
 //      MA 02110-1301, USA.
 //
 
+#define luaL_register(L,n,l)    (luaL_openlib(L,(n),(l),0))
 #include <lauxlib.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -88,7 +89,7 @@ static gint lualock_lua_timer_stop(lua_State *L) {
 }
 
 void lualock_lua_timer_init(lua_State *L) {
-    const struct luaL_reg lualock_timer_lib[] = {
+    const struct luaL_Reg lualock_timer_lib[] = {
         { "start", lualock_lua_timer_start },
         { "stop", lualock_lua_timer_stop },
         { NULL, NULL }
diff --git a/clib/utils.c b/clib/utils.c
index ff03a2a..f170777 100644
--- a/clib/utils.c
+++ b/clib/utils.c
@@ -1,3 +1,4 @@
+#define luaL_register(L,n,l)    (luaL_openlib(L,(n),(l),0))
 #include <glib.h>
 #include <lauxlib.h>
 #include <unistd.h>
@@ -91,7 +92,7 @@ static gint lualock_lua_parse_color(lua_State *L) {
 }
 
 void lualock_lua_utils_init(lua_State *L) {
-    const struct luaL_reg lualock_utils_lib[] = {
+    const struct luaL_Reg lualock_utils_lib[] = {
         { "spawn", lualock_lua_spawn },
         { "get_data_dir", lualock_lua_get_data_dir },
         { "get_config_dir", lualock_lua_get_config_dir },