diff --git a/.cvsignore b/.cvsignore
index 38c43c2..2c3ec59 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tolua++-1.0.92.tar.bz2
+tolua++-1.0.93.tar.bz2
diff --git a/sources b/sources
index d39898f..8e91745 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4682e065b7d6d4de5eec13e6b7d347c  tolua++-1.0.92.tar.bz2
+100aa6907b8108582080b37d79c0afd7  tolua++-1.0.93.tar.bz2
diff --git a/tolua++-1.0.92-gcc43.patch b/tolua++-1.0.92-gcc43.patch
deleted file mode 100644
index 1727469..0000000
--- a/tolua++-1.0.92-gcc43.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -urN tolua++-1.0.92/include/tolua++.h tolua++-1.0.92.gcc43/include/tolua++.h
---- tolua++-1.0.92/include/tolua++.h	2006-04-27 05:33:40.000000000 +0200
-+++ tolua++-1.0.92.gcc43/include/tolua++.h	2008-03-13 23:20:12.000000000 +0100
-@@ -53,7 +53,7 @@
- #define TOLUA_NOPEER	LUA_REGISTRYINDEX /* for lua 5.1 */
- 
- TOLUA_API const char* tolua_typename (lua_State* L, int lo);
--TOLUA_API void tolua_error (lua_State* L, char* msg, tolua_Error* err);
-+TOLUA_API void tolua_error (lua_State* L, const char* msg, tolua_Error* err);
- TOLUA_API int tolua_isnoobj (lua_State* L, int lo, tolua_Error* err);
- TOLUA_API int tolua_isvalue (lua_State* L, int lo, int def, tolua_Error* err);
- TOLUA_API int tolua_isboolean (lua_State* L, int lo, int def, tolua_Error* err);
-@@ -84,16 +84,15 @@
- TOLUA_API int tolua_register_gc (lua_State* L, int lo);
- TOLUA_API int tolua_default_collect (lua_State* tolua_S);
- 
--TOLUA_API void tolua_usertype (lua_State* L, char* type);
--TOLUA_API void tolua_beginmodule (lua_State* L, char* name);
-+TOLUA_API void tolua_usertype (lua_State* L, const char* type);
-+TOLUA_API void tolua_beginmodule (lua_State* L, const char* name);
- TOLUA_API void tolua_endmodule (lua_State* L);
--TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar);
--TOLUA_API void tolua_class (lua_State* L, char* name, char* base);
--TOLUA_API void tolua_cclass (lua_State* L, char* lname, char* name, char* base, lua_CFunction col);
--TOLUA_API void tolua_function (lua_State* L, char* name, lua_CFunction func);
--TOLUA_API void tolua_constant (lua_State* L, char* name, double value);
--TOLUA_API void tolua_variable (lua_State* L, char* name, lua_CFunction get, lua_CFunction set);
--TOLUA_API void tolua_array (lua_State* L,char* name, lua_CFunction get, lua_CFunction set);
-+TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar);
-+TOLUA_API void tolua_cclass (lua_State* L, const char* lname, const char* name, const char* base, lua_CFunction col);
-+TOLUA_API void tolua_function (lua_State* L, const char* name, lua_CFunction func);
-+TOLUA_API void tolua_constant (lua_State* L, const char* name, double value);
-+TOLUA_API void tolua_variable (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set);
-+TOLUA_API void tolua_array (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set);
- 
- /* TOLUA_API void tolua_set_call_event(lua_State* L, lua_CFunction func, char* type); */
- /* TOLUA_API void tolua_addbase(lua_State* L, char* name, char* base); */
-diff -urN tolua++-1.0.92/src/lib/tolua_is.c tolua++-1.0.92.gcc43/src/lib/tolua_is.c
---- tolua++-1.0.92/src/lib/tolua_is.c	2005-12-19 02:13:05.000000000 +0100
-+++ tolua++-1.0.92.gcc43/src/lib/tolua_is.c	2008-03-13 23:11:27.000000000 +0100
-@@ -85,7 +85,7 @@
- 	return lua_tostring(L,-1);
- }
- 
--TOLUA_API void tolua_error (lua_State* L, char* msg, tolua_Error* err)
-+TOLUA_API void tolua_error (lua_State* L, const char* msg, tolua_Error* err)
- {
- 	if (msg[0] == '#')
- 	{
-diff -urN tolua++-1.0.92/src/lib/tolua_map.c tolua++-1.0.92.gcc43/src/lib/tolua_map.c
---- tolua++-1.0.92/src/lib/tolua_map.c	2006-03-13 23:37:49.000000000 +0100
-+++ tolua++-1.0.92.gcc43/src/lib/tolua_map.c	2008-03-13 23:21:58.000000000 +0100
-@@ -389,7 +389,7 @@
- 	* It creates the correspoding metatable in the registry, for both 'type' and 'const type'.
- 	* It maps 'const type' as being also a 'type'
- */
--TOLUA_API void tolua_usertype (lua_State* L, char* type)
-+TOLUA_API void tolua_usertype (lua_State* L, const char* type)
- {
-  char ctype[128] = "const ";
-  strncat(ctype,type,120);
-@@ -403,7 +403,7 @@
- /* Begin module
- 	* It pushes the module (or class) table on the stack
- */
--TOLUA_API void tolua_beginmodule (lua_State* L, char* name)
-+TOLUA_API void tolua_beginmodule (lua_State* L, const char* name)
- {
- 	if (name)
- 	{
-@@ -426,7 +426,7 @@
- 	* It creates a new module
- */
- #if 1
--TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar)
-+TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar)
- {
- 	if (name)
- 	{
-@@ -462,7 +462,7 @@
- 	lua_pop(L,1);               /* pop module */
- }
- #else
--TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar)
-+TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar)
- {
- 	if (name)
- 	{
-@@ -518,7 +518,7 @@
- /* Map C class
- 	* It maps a C class, setting the appropriate inheritance and super classes.
- */
--TOLUA_API void tolua_cclass (lua_State* L, char* lname, char* name, char* base, lua_CFunction col)
-+TOLUA_API void tolua_cclass (lua_State* L, const char* lname, const char* name, const char* base, lua_CFunction col)
- {
- 	char cname[128] = "const ";
- 	char cbase[128] = "const ";
-@@ -577,7 +577,7 @@
- /* Map function
- 	* It assigns a function into the current module (or class)
- */
--TOLUA_API void tolua_function (lua_State* L, char* name, lua_CFunction func)
-+TOLUA_API void tolua_function (lua_State* L, const char* name, lua_CFunction func)
- {
-  lua_pushstring(L,name);
-  lua_pushcfunction(L,func);
-@@ -600,7 +600,7 @@
- /* Map constant number
- 	* It assigns a constant number into the current module (or class)
- */
--TOLUA_API void tolua_constant (lua_State* L, char* name, double value)
-+TOLUA_API void tolua_constant (lua_State* L, const char* name, double value)
- {
- 	lua_pushstring(L,name);
- 	tolua_pushnumber(L,value);
-@@ -611,7 +611,7 @@
- /* Map variable
- 	* It assigns a variable into the current module (or class)
- */
--TOLUA_API void tolua_variable (lua_State* L, char* name, lua_CFunction get, lua_CFunction set)
-+TOLUA_API void tolua_variable (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set)
- {
- 	/* get func */
- 	lua_pushstring(L,".get");
-@@ -663,7 +663,7 @@
- /* Map an array
- 	* It assigns an array into the current module (or class)
- */
--TOLUA_API void tolua_array (lua_State* L, char* name, lua_CFunction get, lua_CFunction set)
-+TOLUA_API void tolua_array (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set)
- {
- 	lua_pushstring(L,".get");
- 	lua_rawget(L,-2);
diff --git a/tolua++-1.0.92-makeso.patch b/tolua++-1.0.92-makeso.patch
deleted file mode 100644
index 4265d9e..0000000
--- a/tolua++-1.0.92-makeso.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- tolua++-1.0.92/SConstruct.orig	2006-04-10 10:45:44.000000000 +0100
-+++ tolua++-1.0.92/SConstruct	2006-06-02 15:12:34.000000000 +0100
-@@ -22,7 +22,7 @@
- opts.Add('LIBPATH', 'library path', [])
- 
- opts.Add('tolua_bin', 'the resulting binary', 'tolua++')
--opts.Add('tolua_lib', 'the resulting library', 'tolua++')
-+opts.Add('tolua_lib', 'the resulting library', 'tolua++-5.1')
- opts.Add('TOLUAPP', 'the name of the tolua++ binary (to use with built_dev=1)', 'tolua++')
- 
- opts.Add('prefix', 'The installation prefix')
---- tolua++-1.0.92/config_linux.py.orig	2005-04-30 03:20:38.000000000 +0100
-+++ tolua++-1.0.92/config_linux.py	2006-06-02 15:09:03.000000000 +0100
-@@ -15,8 +15,8 @@
- #
- # You can see more 'generic' options for POSIX systems on config_posix.py
- 
--prefix = '/usr/local'
-+prefix = '/usr'
- 
- # libraries (based on Debian's installation of lua)
--LIBS = ['lua50', 'lualib50', 'dl', 'm']
-+LIBS = ['lua', 'dl', 'm']
- 
---- tolua++-1.0.92/custom-5.1.py.orig	2006-02-13 23:57:26.000000000 +0000
-+++ tolua++-1.0.92/custom-5.1.py	2006-06-02 15:10:08.000000000 +0100
-@@ -1,11 +1,11 @@
- CC = 'gcc'
- CCFLAGS = ['-I/usr/include/lua5.1', '-O2', '-ansi']
- #LIBPATH = ['/usr/local/lib']
--LIBS = ['lua5.1', 'dl', 'm']
--prefix = '/usr/local'
-+LIBS = ['lua', 'dl', 'm']
-+prefix = '/usr'
- build_dev = 1
--ENV = {'PATH': '/usr/local/bin:/bin:/usr/bin'}
--tolua_bin = 'tolua++5.1'
--tolua_lib = 'tolua++5.1'
-+ENV = {'PATH': '/bin:/usr/bin:/usr/local/bin'}
-+tolua_bin = 'tolua++'
-+tolua_lib = 'tolua++-5.1'
- TOLUAPP = 'tolua++5.1'
- 
---- tolua++-1.0.92/src/lib/SCsub.orig	2005-11-28 13:51:15.000000000 +0000
-+++ tolua++-1.0.92/src/lib/SCsub	2006-06-02 15:11:17.000000000 +0100
-@@ -9,5 +9,4 @@
- 	'tolua_to.c',
- 	]
- 
--env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
--
-+env.lib_target = env.SharedLibrary('#/lib/'+env['tolua_lib'], sources)
diff --git a/tolua++-1.0.93-lua51.patch b/tolua++-1.0.93-lua51.patch
new file mode 100644
index 0000000..fb7574d
--- /dev/null
+++ b/tolua++-1.0.93-lua51.patch
@@ -0,0 +1,32 @@
+diff -urN tolua++-1.0.93/config_linux.py tolua++-1.0.93.lua51/config_linux.py
+--- tolua++-1.0.93/config_linux.py	2005-11-30 23:31:27.000000000 +0100
++++ tolua++-1.0.93.lua51/config_linux.py	2010-02-25 14:35:06.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ # Compiler flags (based on Debian's installation of lua)
+ #LINKFLAGS = ['-g']
+-CCFLAGS = ['-I/usr/include/lua50', '-O2', '-ansi', '-Wall']
++CCFLAGS = ['-O2', '-ansi', '-Wall']
+ #CCFLAGS = ['-I/usr/include/lua50', '-g']
+ 
+ # this is the default directory for installation. Files will be installed on
+@@ -18,5 +18,5 @@
+ prefix = '/usr/local'
+ 
+ # libraries (based on Debian's installation of lua)
+-LIBS = ['lua50', 'lualib50', 'dl', 'm']
++LIBS = ['lua', 'dl', 'm']
+ 
+diff -urN tolua++-1.0.93/custom.py tolua++-1.0.93.lua51/custom.py
+--- tolua++-1.0.93/custom.py	1970-01-01 01:00:00.000000000 +0100
++++ tolua++-1.0.93.lua51/custom.py	2010-02-25 14:44:50.000000000 +0100
+@@ -0,0 +1,9 @@
++CCFLAGS = ['-O2', '-ansi']
++#LIBPATH = ['/usr/local/lib']
++LIBS = ['lua', 'dl', 'm']
++prefix = '/usr'
++build_dev=1
++tolua_bin = 'tolua++'
++tolua_lib = 'tolua++-5.1'
++TOLUAPP = 'tolua++-5.1'
++
diff --git a/tolua++.spec b/tolua++.spec
index 5110995..f37771d 100644
--- a/tolua++.spec
+++ b/tolua++.spec
@@ -1,15 +1,14 @@
 %define         solib tolua++-5.1
 
 Name:           tolua++
-Version:        1.0.92
-Release:        9%{?dist}
+Version:        1.0.93
+Release:        1%{?dist}
 Summary:        A tool to integrate C/C++ code with Lua
 Group:          Development/Tools
-License:        Freely redistributable without restriction
+License:        MIT
 URL:            http://www.codenix.com/~tolua/
 Source0:        http://www.codenix.com/~tolua/%{name}-%{version}.tar.bz2
-Patch0:         tolua++-1.0.92-makeso.patch
-Patch1:         tolua++-1.0.92-gcc43.patch
+Patch0:         tolua++-1.0.93-lua51.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scons
 BuildRequires:  lua-devel >= 5.1
@@ -31,13 +30,12 @@ Development files for tolua++
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .lua51
 sed -i 's/\r//' doc/%{name}.html
 
 
 %build
-scons %{?_smp_mflags} -Q CCFLAGS="%{optflags}  -I%{_includedir}" tolua_lib=%{solib} LINKFLAGS="-Wl,-soname,lib%{solib}.so"
+scons %{?_smp_mflags} -Q CCFLAGS="%{optflags}  -I%{_includedir}" tolua_lib=%{solib} LINKFLAGS="-Wl,-soname,lib%{solib}.so" shared=1
 #Recompile the exe without the soname. An ugly hack.
 gcc -o bin/%{name} src/bin/tolua.o src/bin/toluabind.o -Llib -l%{solib} -llua -ldl -lm
 
@@ -76,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 25 2010 Tim Niemueller <tim@niemueller.de> - 1.0.93-1
+- Upgrade to 1.0.93
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.92-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild