diff --git a/rrdtool-1.5.4-lua-5.2.patch b/rrdtool-1.5.4-lua-5.2.patch
new file mode 100644
index 0000000..1a6a25f
--- /dev/null
+++ b/rrdtool-1.5.4-lua-5.2.patch
@@ -0,0 +1,31 @@
+diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c
+index bfbc174..b54f787 100644
+--- a/bindings/lua/rrdlua.c
++++ b/bindings/lua/rrdlua.c
+@@ -350,7 +350,7 @@ set_info (lua_State * L)
+ 
+ /**********************************************************/
+ 
+-static const struct luaL_reg rrd[] = {
++static const struct luaL_Reg rrd[] = {
+   {"create", lua_rrd_create},
+   {"dump", lua_rrd_dump},
+   {"fetch", lua_rrd_fetch},
+diff --git a/configure.ac b/configure.ac
+index 1a84037..4575f00 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -813,7 +813,12 @@ LUA_EOF
+       LIBS=
+       lua_havelib=no
+       LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
+-      AC_SEARCH_LIBS(lua_call, lua$lua_vdot lua$lua_vndot lua,
++      if test "$lua_vndot" -ge "52"; then
++        CALL_FUNC=lua_callk
++      else
++        CALL_FUNC=lua_call
++      fi
++      AC_SEARCH_LIBS($CALL_FUNC, lua$lua_vdot lua$lua_vndot lua,
+         [AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua,
+           [lua_havelib=LUA$lua_vndot],
+           [AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib,
diff --git a/rrdtool-1.5.4.tar.gz b/rrdtool-1.5.4.tar.gz
deleted file mode 100644
index f8a7ff0..0000000
--- a/rrdtool-1.5.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3feea3da87c02128a27083f1c7b2cb797ef673e946564c0ce008c1c25a5c3f99
-size 2181438
diff --git a/rrdtool-1.5.5.tar.gz b/rrdtool-1.5.5.tar.gz
new file mode 100644
index 0000000..0f94f7f
--- /dev/null
+++ b/rrdtool-1.5.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6
+size 2187685
diff --git a/rrdtool.changes b/rrdtool.changes
index bf75b14..4ad6a12 100644
--- a/rrdtool.changes
+++ b/rrdtool.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Nov 25 12:40:01 UTC 2015 - aj@ajaissle.de
+
+- Update to 1.5.5
+
+  Bugfixes
+  * fix JSON output in xport with legend and gprint blocks
+  * fix parse_time mutex unlocking in the error case
+  * don't crash on invalid variable names in CDEF
+  * add mutex locking in rrdc_fetch
+  * fix buffer overflow in rrd_restore
+  * shorten test precision to 7 digits ... 
+  * never exit from a library function
+  * buffer overflow in rrd_restore.c fixed #669
+
+- Added rrdtool-1.5.4-lua-5.2.patch: lua >= 5.2 uses lua_callk 
+
 -------------------------------------------------------------------
 Wed Sep 23 07:55:35 UTC 2015 - aj@ajaissle.de
 
diff --git a/rrdtool.spec b/rrdtool.spec
index 7f78896..9637d8b 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -26,7 +26,7 @@
 %bcond_with     rados
 
 Name:           rrdtool
-Version:        1.5.4
+Version:        1.5.5
 Release:        0
 Summary:        Round Robin Database Tool to store and display time-series data
 License:        GPL-2.0+ and LGPL-2.0+
@@ -41,6 +41,8 @@ Source99:       %{name}.changes
 Patch3:         rrdtool-tclsegfault.patch
 # PATCH-FIX-UPSTREAM -- bnc#793636
 Patch12:        rrdtool-zero_vs_nothing.patch
+# PATCH-FIX-UPSTREAM -- lua >= 5.2 uses lua_callk
+Patch13:        rrdtool-1.5.4-lua-5.2.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cairo-devel >= 1.2
@@ -121,7 +123,6 @@ Summary:        Lua bindings for RRDtool
 Group:          Development/Languages/Other
 BuildRequires:  lua51-devel
 Requires:       %{name} = %{version}-%{release}
-Requires:       lua
 
 %description -n lua-%{name}
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -131,6 +132,7 @@ server load average). This package contains documentation on using RRD.
 This package contains the Lua bindings.
 %endif
 
+
 %if %{with python}
 %package -n python-%{name}
 Summary:        Python bindings for RRDtool
@@ -143,6 +145,7 @@ Requires:       python >= %{python_version}
 Python RRDtool bindings.
 %endif
 
+
 %if %{with ruby}
 %package -n ruby-%{name}
 Summary:        Ruby bindings for RRDtool
@@ -159,6 +162,7 @@ server load average). This package contains documentation on using RRD.
 This package contains the Ruby bindings.
 %endif
 
+
 %if %{with tcl}
 %package -n tcl-%{name}
 Summary:        Tcl bindings for RRDtool
@@ -175,6 +179,7 @@ server load average). This package contains documentation on using RRD.
 This package contains the Tcl bindings.
 %endif
 
+
 %package cached
 %define         rrdcached_user  rrdcached
 %define         rrdcached_group rrdcached
@@ -196,6 +201,7 @@ daemon was written to alleviate these problems.
 %setup -q
 %patch3
 %patch12 -p1
+%patch13 -p1
 
 # rrd_tool/rrd_cgi: use the date of the last change
 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"