diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index 7715e0c7dee..ae5a3efd995 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.33 2007/10/29 22:38:42 jolan Exp $
+# $OpenBSD: Makefile,v 1.34 2008/04/19 17:59:32 okan Exp $
 
 COMMENT=	powerful, light-weight programming language
 
-DISTNAME=	lua-5.1.2
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	lua-5.1.3
 CATEGORIES=	lang
 
 MASTER_SITES=	http://www.lua.org/ftp/ \
@@ -23,6 +22,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 SHARED_ONLY=	Yes
 SHARED_LIBS=	lua 5.1
+MAKE_FLAGS+=	LIBlua_VERSION="${LIBlua_VERSION}"
 WANTLIB=	c m edit curses
 NO_REGRESS=	Yes
 
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index c27d541b1a3..b83f145318a 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -1,5 +1,5 @@
-MD5 (lua-5.1.2.tar.gz) = aHzkwqHd/xjxAISQ/cTl4A==
-RMD160 (lua-5.1.2.tar.gz) = ATUFSbOgWDiSXa4aZmcAu58bwBo=
-SHA1 (lua-5.1.2.tar.gz) = ikYNLX5w6Ty3K/PVhEBUZHY8tfA=
-SHA256 (lua-5.1.2.tar.gz) = XPCYxv5o09LZIhkE8QF/8ChuSpzBZqFFKkVt+biLPZ4=
-SIZE (lua-5.1.2.tar.gz) = 214134
+MD5 (lua-5.1.3.tar.gz) = pwqN+qFQ4EeGbcAaRiclmQ==
+RMD160 (lua-5.1.3.tar.gz) = HFl53UmGBX/vMlqirwyHK77KuS4=
+SHA1 (lua-5.1.3.tar.gz) = ibyfWjUUAlZbgHfoEjMn580V8AQ=
+SHA256 (lua-5.1.3.tar.gz) = a13y7apeAr8aLYXhRCsuMpSTswsMB4D3cZnSTwh9KW0=
+SIZE (lua-5.1.3.tar.gz) = 215817
diff --git a/lang/lua/patches/patch-Makefile b/lang/lua/patches/patch-Makefile
index 3d89be5f8cc..b19b6f10352 100644
--- a/lang/lua/patches/patch-Makefile
+++ b/lang/lua/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.5 2007/10/29 20:30:32 espie Exp $
---- Makefile.orig	Sun Mar 25 16:44:39 2007
-+++ Makefile	Mon Oct 29 21:26:20 2007
+$OpenBSD: patch-Makefile,v 1.6 2008/04/19 17:59:32 okan Exp $
+--- Makefile.orig	Thu Jan 17 18:53:37 2008
++++ Makefile	Mon Mar 24 14:54:18 2008
 @@ -5,14 +5,14 @@
  # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
  
@@ -18,12 +18,12 @@ $OpenBSD: patch-Makefile,v 1.5 2007/10/29 20:30:32 espie Exp $
  INSTALL_BIN= $(INSTALL_TOP)/bin
  INSTALL_INC= $(INSTALL_TOP)/include
  INSTALL_LIB= $(INSTALL_TOP)/lib
-@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw
+@@ -38,7 +38,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw
  # What to install.
  TO_BIN= lua luac
  TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
 -TO_LIB= liblua.a
-+TO_LIB= liblua.a liblua.so.5.1
++TO_LIB= liblua.a liblua.so.${LIBlua_VERSION}
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
diff --git a/lang/lua/patches/patch-etc_lua_pc b/lang/lua/patches/patch-etc_lua_pc
index 59501fe6e0c..4bbb53e9d00 100644
--- a/lang/lua/patches/patch-etc_lua_pc
+++ b/lang/lua/patches/patch-etc_lua_pc
@@ -1,8 +1,7 @@
-$OpenBSD: patch-etc_lua_pc,v 1.3 2007/10/29 22:38:42 jolan Exp $
+$OpenBSD: patch-etc_lua_pc,v 1.4 2008/04/19 17:59:32 okan Exp $
 --- etc/lua.pc.orig	Fri Mar 23 20:58:49 2007
 +++ etc/lua.pc	Mon Oct 29 21:26:20 2007
 @@ -8,7 +8,7 @@ V= 5.1
- R= 5.1.2
  
  # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
 -prefix= /usr/local
diff --git a/lang/lua/patches/patch-src_Makefile b/lang/lua/patches/patch-src_Makefile
index 4ec53990d0f..79fe42e983a 100644
--- a/lang/lua/patches/patch-src_Makefile
+++ b/lang/lua/patches/patch-src_Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_Makefile,v 1.4 2007/10/29 20:30:32 espie Exp $
---- src/Makefile.orig	Sun Mar 25 16:49:23 2007
-+++ src/Makefile	Mon Oct 29 21:28:39 2007
+$OpenBSD: patch-src_Makefile,v 1.5 2008/04/19 17:59:32 okan Exp $
+--- src/Makefile.orig	Sat Jan 19 20:37:58 2008
++++ src/Makefile	Mon Mar 24 14:17:33 2008
 @@ -7,8 +7,7 @@
  # Your platform. See PLATS for possible values.
  PLAT= none
@@ -15,7 +15,7 @@ $OpenBSD: patch-src_Makefile,v 1.4 2007/10/29 20:30:32 espie Exp $
  
  LUAC_T=	luac
  LUAC_O=	luac.o print.o
-+LUA_SO= liblua.so.5.1
++LUA_SO=	liblua.so.${LIBlua_VERSION}
  
  ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
 -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
diff --git a/lang/lua/patches/patch-src_lparser_c b/lang/lua/patches/patch-src_lparser_c
deleted file mode 100644
index bd54448e5e9..00000000000
--- a/lang/lua/patches/patch-src_lparser_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_lparser_c,v 1.1 2007/09/15 09:42:57 jolan Exp $
---- src/lparser.c.orig	Tue Jul 31 02:55:45 2007
-+++ src/lparser.c	Tue Jul 31 02:57:35 2007
-@@ -938,6 +938,8 @@ static void assignment (LexState *ls, struct LHS_assig
-     primaryexp(ls, &nv.v);
-     if (nv.v.k == VLOCAL)
-       check_conflict(ls, lh, &nv.v);
-+    luaY_checklimit(ls->fs, ls->L->nCcalls + nvars, LUAI_MAXCCALLS,
-+                    "variable names");
-     assignment(ls, &nv, nvars+1);
-   }
-   else {  /* assignment -> `=' explist1 */
diff --git a/lang/lua/patches/patch-src_luaconf_h b/lang/lua/patches/patch-src_luaconf_h
index 38126f4495e..e641b3cdc1b 100644
--- a/lang/lua/patches/patch-src_luaconf_h
+++ b/lang/lua/patches/patch-src_luaconf_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_luaconf_h,v 1.3 2007/10/29 20:30:32 espie Exp $
---- src/luaconf.h.orig	Sat Mar 24 04:01:55 2007
-+++ src/luaconf.h	Mon Oct 29 21:26:20 2007
+$OpenBSD: patch-src_luaconf_h,v 1.4 2008/04/19 17:59:32 okan Exp $
+--- src/luaconf.h.orig	Fri Jan 18 18:07:48 2008
++++ src/luaconf.h	Mon Mar 24 13:53:08 2008
 @@ -33,7 +33,7 @@
  #define LUA_WIN
  #endif
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_luaconf_h,v 1.3 2007/10/29 20:30:32 espie Exp $
  #define LUA_USE_POSIX
  #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
  #define LUA_USE_READLINE	/* needs some extra libraries */
-@@ -519,7 +519,7 @@
+@@ -520,7 +520,7 @@
  */
  #define LUA_NUMBER_SCAN		"%lf"
  #define LUA_NUMBER_FMT		"%.14g"
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_luaconf_h,v 1.3 2007/10/29 20:30:32 espie Exp $
  #define LUAI_MAXNUMBER2STR	32 /* 16 digits, sign, point, and \0 */
  #define lua_str2number(s,p)	strtod((s), (p))
  
-@@ -646,7 +646,7 @@ union luai_Cast { double l_d; long l_l; };
+@@ -647,7 +647,7 @@ union luai_Cast { double l_d; long l_l; };
  #include <unistd.h>
  #define LUA_TMPNAMBUFSIZE	32
  #define lua_tmpnam(b,e)	{ \