diff --git a/rrdtool-1.5.1-lua-5.2.patch b/rrdtool-1.5.4-lua-5.2.patch
similarity index 94%
rename from rrdtool-1.5.1-lua-5.2.patch
rename to rrdtool-1.5.4-lua-5.2.patch
index 7bbba1e..a731728 100644
--- a/rrdtool-1.5.1-lua-5.2.patch
+++ b/rrdtool-1.5.4-lua-5.2.patch
@@ -12,10 +12,10 @@ index bfbc174..b54f787 100644
    {"dump", lua_rrd_dump},
    {"fetch", lua_rrd_fetch},
 diff --git a/configure.ac b/configure.ac
-index 6d277bf..d0d9ea0 100644
+index 1a84037..4575f00 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -810,7 +810,12 @@ LUA_EOF
+@@ -813,7 +813,12 @@ LUA_EOF
        LIBS=
        lua_havelib=no
        LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
diff --git a/rrdtool-1.5.0-ruby-2-fix.patch b/rrdtool-1.5.4-ruby-2-fix.patch
similarity index 92%
rename from rrdtool-1.5.0-ruby-2-fix.patch
rename to rrdtool-1.5.4-ruby-2-fix.patch
index 51802c0..20bc367 100644
--- a/rrdtool-1.5.0-ruby-2-fix.patch
+++ b/rrdtool-1.5.4-ruby-2-fix.patch
@@ -1,8 +1,8 @@
 diff --git a/bindings/Makefile.am b/bindings/Makefile.am
-index 76e9144..bdfee3b 100644
+index 54f5c23..ee85c23 100644
 --- a/bindings/Makefile.am
 +++ b/bindings/Makefile.am
-@@ -30,8 +30,9 @@ install-data-local:
+@@ -35,8 +35,9 @@ install-data-local:
                  && $(MAKE) install ) \
             || true
  	$(AM_V_GEN)test -f ${builddir}/ruby/Makefile \
@@ -14,7 +14,7 @@ index 76e9144..bdfee3b 100644
             || true
  	$(AM_V_GEN)test -d ${builddir}/python/build \
             && ( cd ${builddir}/python \
-@@ -52,7 +53,8 @@ ruby:
+@@ -57,7 +58,8 @@ ruby:
               EPREFIX=$(exec_prefix) \
               ABS_TOP_SRCDIR=${abs_top_srcdir} \
               ABS_TOP_BUILDDIR=${abs_top_builddir} \
diff --git a/rrdtool.spec b/rrdtool.spec
index f28fde9..070818a 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -16,8 +16,8 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.5.3
-Release: 4%{?dist}
+Version: 1.5.4
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
@@ -26,8 +26,8 @@ Source1: php4-%{svnrev}.tar.gz
 Patch1: rrdtool-1.4.4-php54.patch
 # disable logo for php 5.5.
 Patch2: rrdtool-1.4.7-php55.patch
-Patch3: rrdtool-1.5.0-ruby-2-fix.patch
-Patch4: rrdtool-1.5.1-lua-5.2.patch
+Patch3: rrdtool-1.5.4-ruby-2-fix.patch
+Patch4: rrdtool-1.5.4-lua-5.2.patch
 # enable php bindings on ppc
 Patch5: rrdtool-1.4.8-php-ppc-fix.patch
 Patch6: rrdtool-1.5.3-arm-crash-fix.patch
@@ -399,6 +399,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
 %endif
 
 %changelog
+* Mon Aug 10 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 1.5.4-1
+- New version
+  Resolves: rhbz#1251737
+- Defuzzified ruby-2-fix and lua-5.2 patches
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index ab28029..d29f7a6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-868a828cc6b10654c440a85054240ae2  rrdtool-1.5.3.tar.gz
+4daea1e628e1c70d91800d6a06427dc1  rrdtool-1.5.4.tar.gz