diff --git a/devel/lua-lgi/Makefile b/devel/lua-lgi/Makefile
index 077a319bf91..eba1b3be35f 100644
--- a/devel/lua-lgi/Makefile
+++ b/devel/lua-lgi/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2013/05/05 18:50:21 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2013/05/21 07:50:28 dcoppa Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	lua bindings to libraries using GObject-Introspection
 
 DISTNAME=	lgi-0.7.1
-REVISION=	0
+REVISION=	1
 PKGNAME=	lua-${DISTNAME}
 CATEGORIES=	devel
 
@@ -32,7 +32,9 @@ TEST_TARGET=	check
 TEST_IS_INTERACTIVE=x11
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/lgi/Makefile
+	${SUBST_CMD} ${WRKSRC}/lgi/Makefile \
+		${WRKSRC}/lgi/core.c \
+		${WRKSRC}/lgi/core.lua
 
 post-install:
 	${INSTALL_DATA_DIR} ${MODLUA_EXAMPLEDIR}
diff --git a/devel/lua-lgi/patches/patch-lgi_core_c b/devel/lua-lgi/patches/patch-lgi_core_c
new file mode 100644
index 00000000000..f90e671c63f
--- /dev/null
+++ b/devel/lua-lgi/patches/patch-lgi_core_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-lgi_core_c,v 1.4 2013/05/21 07:50:28 dcoppa Exp $
+--- lgi/core.c.orig	Mon May 20 14:17:38 2013
++++ lgi/core.c	Mon May 20 14:18:14 2013
+@@ -607,7 +607,7 @@ set_resident (lua_State *L)
+ }
+ 
+ int
+-luaopen_lgi_corelgilua51 (lua_State* L)
++luaopen_lgi_corelgilua${MODLUA_DEP_VERSION} (lua_State* L)
+ {
+   LgiStateMutex *mutex;
+ 
diff --git a/devel/lua-lgi/patches/patch-lgi_core_lua b/devel/lua-lgi/patches/patch-lgi_core_lua
new file mode 100644
index 00000000000..48e6dc04f9c
--- /dev/null
+++ b/devel/lua-lgi/patches/patch-lgi_core_lua
@@ -0,0 +1,9 @@
+$OpenBSD: patch-lgi_core_lua,v 1.1 2013/05/21 07:50:28 dcoppa Exp $
+--- lgi/core.lua.orig	Mon May 20 14:17:43 2013
++++ lgi/core.lua	Mon May 20 14:18:24 2013
+@@ -11,4 +11,4 @@
+ -- This module decides what kind of core routines should be loaded.
+ -- Currently only one implementation exists, standard-Lua C-side
+ -- implementation, LuaJIT-FFI-based one is planned.
+-return require 'lgi.corelgilua51'
++return require 'lgi.corelgilua${MODLUA_DEP_VERSION}'