diff --git a/rrdtool.spec b/rrdtool.spec
index 2467c3b..6dece6d 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -17,18 +17,14 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.4.8
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
 Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
 Source1: php4-%{svnrev}.tar.gz
 Patch1: rrdtool-1.4.4-php54.patch
-# workaround for rhbz#92165
-# Do not apply on RHEL-6 or lower
-%if %{?rhel} %{?!rhel:7} > 6
 Patch2: rrdtool-1.4.7-ruby-2-fix.patch
-%endif
 # disable logo for php 5.5.
 Patch3: rrdtool-1.4.7-php55.patch
 Patch4: rrdtool-1.4.7-autoconf-fix.patch
@@ -177,6 +173,7 @@ The %{name}-lua package includes RRDtool bindings for Lua.
 %patch1 -p1 -b .php54
 %patch3 -p1 -b .php55
 %endif
+# Workaround for rhbz#92165
 # Do not apply on RHEL-6 or lower
 %if %{?rhel} %{?!rhel:7} > 6
 %patch2 -p1 -b .ruby-2-fix
@@ -398,6 +395,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
 %endif
 
 %changelog
+* Fri Aug  8 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.8-15
+- Fixed conditionalized patch to be according to Packaging guidelines
+
 * Tue Jun 24 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.8-14
 - Improved backward compatibility
   Resolves: rhbz#111633