diff --git a/package/openwsman.spec.in b/package/openwsman.spec.in
index a681e5c..3b3387e 100644
--- a/package/openwsman.spec.in
+++ b/package/openwsman.spec.in
@@ -62,7 +62,7 @@
 %endif
 %endif
 
-%if 0%{?fedora} == 19
+%if 0%{?fedora} > 20
 BuildRequires:  rubypick
 %endif
 
@@ -213,8 +213,8 @@
 %package ruby
 Requires:       ruby
 
-# RbConfig::CONFIG["ruby_version"] is empty in Fedora 19 !?
-%if 0%{?fedora} == 19
+# RbConfig::CONFIG["ruby_version"] is empty in Fedora > 18 !?
+%if 0%{?fedora} > 18
 %{!?ruby_version: %global ruby_version %(ruby -r rbconfig -e 'print(RbConfig::CONFIG["RUBY_PROGRAM_VERSION"])')}
 %else
 %{!?ruby_version: %global ruby_version %(ruby -r rbconfig -e 'print(RbConfig::CONFIG["ruby_version"])')}
@@ -339,7 +339,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/authenticators/*.la
 [ -d $RPM_BUILD_ROOT%{ruby_sitelib} ] && rm -f $RPM_BUILD_ROOT%{ruby_sitelib}/openwsmanplugin.rb
 [ -d $RPM_BUILD_ROOT%{ruby_vendorlib} ] && rm -f $RPM_BUILD_ROOT%{ruby_vendorlib}/openwsmanplugin.rb
-%if 0%{?suse_version} <= 1210
+%if 0%{?suse_version} <= 1220
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
 install -m 755 build/etc/init/openwsmand.sh $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openwsmand
 ln -sf %{_sysconfdir}/init.d/openwsmand $RPM_BUILD_ROOT%{_sbindir}/rcopenwsmand