diff --git a/SPECS/ruby.spec b/SPECS/ruby.spec
index 361a33d0..67057553 100644
--- a/SPECS/ruby.spec
+++ b/SPECS/ruby.spec
@@ -642,7 +642,9 @@ mkdir -p %{buildroot}%{_exec_prefix}/lib{,64}/gems/%{name}
 # make symlinks for io-console and bigdecimal, which are considered to be part of stdlib by other Gems
 mkdir -p %{buildroot}%{gem_dir}/gems/irb-%{irb_version}/lib
 mv %{buildroot}%{ruby_libdir}/irb* %{buildroot}%{gem_dir}/gems/irb-%{irb_version}/lib
+%ifnarch x86_64
 mv %{buildroot}%{gem_dir}/specifications/default/irb-%{irb_version}.gemspec %{buildroot}%{gem_dir}/specifications
+%endif
 ln -s %{gem_dir}/gems/irb-%{irb_version}/lib/irb.rb %{buildroot}%{ruby_libdir}/irb.rb
 # TODO: This should be possible to replaced by simple directory symlink
 # after ~ F31 EOL (rhbz#1691039).
@@ -654,14 +656,18 @@ popd
 
 mkdir -p %{buildroot}%{gem_dir}/gems/rdoc-%{rdoc_version}/lib
 mv %{buildroot}%{ruby_libdir}/rdoc* %{buildroot}%{gem_dir}/gems/rdoc-%{rdoc_version}/lib
+%ifnarch x86_64
 mv %{buildroot}%{gem_dir}/specifications/default/rdoc-%{rdoc_version}.gemspec %{buildroot}%{gem_dir}/specifications
+%endif
 
 mkdir -p %{buildroot}%{gem_dir}/gems/bigdecimal-%{bigdecimal_version}/lib
 mkdir -p %{buildroot}%{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}/bigdecimal
 mv %{buildroot}%{ruby_libdir}/bigdecimal %{buildroot}%{gem_dir}/gems/bigdecimal-%{bigdecimal_version}/lib
 mv %{buildroot}%{ruby_libarchdir}/bigdecimal.so %{buildroot}%{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}
 mv %{buildroot}%{ruby_libarchdir}/bigdecimal/util.so %{buildroot}%{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}/bigdecimal
+%ifnarch x86_64
 mv %{buildroot}%{gem_dir}/specifications/default/bigdecimal-%{bigdecimal_version}.gemspec %{buildroot}%{gem_dir}/specifications
+%endif
 ln -s %{gem_dir}/gems/bigdecimal-%{bigdecimal_version}/lib/bigdecimal %{buildroot}%{ruby_libdir}/bigdecimal
 ln -s %{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}/bigdecimal.so %{buildroot}%{ruby_libarchdir}/bigdecimal.so
 ln -s %{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}/bigdecimal/util.so %{buildroot}%{ruby_libarchdir}/bigdecimal/util.so
@@ -671,13 +677,17 @@ ln -s %{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}/bigdecimal/util.s
 mkdir -p %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib
 mv %{buildroot}%{ruby_libdir}/bundler.rb %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib
 mv %{buildroot}%{ruby_libdir}/bundler %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib
+%ifnarch x86_64
 mv %{buildroot}%{gem_dir}/specifications/default/bundler-%{bundler_version}.gemspec %{buildroot}%{gem_dir}/specifications
+%endif
 
 mkdir -p %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib
 mkdir -p %{buildroot}%{_libdir}/gems/%{name}/io-console-%{io_console_version}/io
 mv %{buildroot}%{ruby_libdir}/io %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib
 mv %{buildroot}%{ruby_libarchdir}/io/console.so %{buildroot}%{_libdir}/gems/%{name}/io-console-%{io_console_version}/io
+%ifnarch x86_64
 mv %{buildroot}%{gem_dir}/specifications/default/io-console-%{io_console_version}.gemspec %{buildroot}%{gem_dir}/specifications
+%endif
 ln -s %{gem_dir}/gems/io-console-%{io_console_version}/lib/io %{buildroot}%{ruby_libdir}/io
 ln -s %{_libdir}/gems/%{name}/io-console-%{io_console_version}/io/console.so %{buildroot}%{ruby_libarchdir}/io/console.so
 
@@ -685,7 +695,9 @@ mkdir -p %{buildroot}%{gem_dir}/gems/json-%{json_version}/lib
 mkdir -p %{buildroot}%{_libdir}/gems/%{name}/json-%{json_version}
 mv %{buildroot}%{ruby_libdir}/json* %{buildroot}%{gem_dir}/gems/json-%{json_version}/lib
 mv %{buildroot}%{ruby_libarchdir}/json/ %{buildroot}%{_libdir}/gems/%{name}/json-%{json_version}/
+%ifnarch x86_64
 mv %{buildroot}%{gem_dir}/specifications/default/json-%{json_version}.gemspec %{buildroot}%{gem_dir}/specifications
+%endif
 ln -s %{gem_dir}/gems/json-%{json_version}/lib/json.rb %{buildroot}%{ruby_libdir}/json.rb
 ln -s %{gem_dir}/gems/json-%{json_version}/lib/json %{buildroot}%{ruby_libdir}/json
 ln -s %{_libdir}/gems/%{name}/json-%{json_version}/json/ %{buildroot}%{ruby_libarchdir}/json
@@ -694,7 +706,9 @@ mkdir -p %{buildroot}%{gem_dir}/gems/openssl-%{openssl_version}/lib
 mkdir -p %{buildroot}%{_libdir}/gems/%{name}/openssl-%{openssl_version}
 mv %{buildroot}%{ruby_libdir}/openssl* %{buildroot}%{gem_dir}/gems/openssl-%{openssl_version}/lib
 mv %{buildroot}%{ruby_libarchdir}/openssl.so %{buildroot}%{_libdir}/gems/%{name}/openssl-%{openssl_version}/
+%ifnarch x86_64
 mv %{buildroot}%{gem_dir}/specifications/default/openssl-%{openssl_version}.gemspec %{buildroot}%{gem_dir}/specifications
+%endif
 # This used to be directory when OpenSSL was integral part of StdLib => Keep
 # it as directory and link everything in it to prevent directory => symlink
 # conversion RPM issues.
@@ -708,7 +722,9 @@ mkdir -p %{buildroot}%{gem_dir}/gems/psych-%{psych_version}/lib
 mkdir -p %{buildroot}%{_libdir}/gems/%{name}/psych-%{psych_version}
 mv %{buildroot}%{ruby_libdir}/psych* %{buildroot}%{gem_dir}/gems/psych-%{psych_version}/lib
 mv %{buildroot}%{ruby_libarchdir}/psych.so %{buildroot}%{_libdir}/gems/%{name}/psych-%{psych_version}/
+%ifnarch x86_64
 mv %{buildroot}%{gem_dir}/specifications/default/psych-%{psych_version}.gemspec %{buildroot}%{gem_dir}/specifications
+%endif
 ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych %{buildroot}%{ruby_libdir}/psych
 ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_libdir}/psych.rb
 ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/psych.so %{buildroot}%{ruby_libarchdir}/psych.so
@@ -719,12 +735,16 @@ find %{buildroot}%{gem_dir}/extensions/*-%{_target_os}/%{ruby_version}/* -maxdep
   -exec mv '{}' %{buildroot}%{_libdir}/gems/%{name}/ \; \
   || echo "No gem binary extensions to move."
 
+%ifnarch x86_64
 # Adjust the gemspec files so that the gems will load properly
 sed -i '/^end$/ i\
   s.extensions = ["json/ext/parser.so", "json/ext/generator.so"]' %{buildroot}%{gem_dir}/specifications/json-%{json_version}.gemspec
+%endif
 
+%ifnarch x86_64
 # Move man pages into proper location
 mv %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/doc/rake.1 %{buildroot}%{_mandir}/man1
+%endif
 
 %if %{with systemtap}
 # Install a tapset and fix up the path to the library.
@@ -1017,6 +1037,7 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 # Explicitly include only RubyGems directory strucure to avoid accidentally
 # packaged content.
 %dir %{gem_dir}
+%ifnarch x86_64
 %dir %{gem_dir}/build_info
 %dir %{gem_dir}/cache
 %dir %{gem_dir}/doc
@@ -1024,11 +1045,15 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %dir %{gem_dir}/gems
 %dir %{gem_dir}/specifications
 %dir %{gem_dir}/specifications/default
+%endif
 %dir %{_exec_prefix}/lib*/gems
 %dir %{_exec_prefix}/lib*/gems/ruby
 
+%ifnarch x86_64
 %exclude %{gem_dir}/cache/*
+%endif
 
+%ifnarch x86_64
 # TODO: Gemify these libraries
 %{gem_dir}/specifications/default/cmath-1.0.0.gemspec
 %{gem_dir}/specifications/default/csv-3.0.9.gemspec
@@ -1059,6 +1084,7 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{gem_dir}/specifications/default/tracer-0.1.0.gemspec
 %{gem_dir}/specifications/default/webrick-1.4.2.gemspec
 %{gem_dir}/specifications/default/zlib-1.0.0.gemspec
+%endif
 
 %files -n rubygems-devel
 %{_rpmconfigdir}/macros.d/macros.rubygems
@@ -1069,22 +1095,28 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 
 %files -n rubygem-rake
 %{_bindir}/rake
+%ifnarch x86_64
 %{gem_dir}/gems/rake-%{rake_version}
 %{gem_dir}/specifications/rake-%{rake_version}.gemspec
 %{_mandir}/man1/rake.1*
+%endif
 
 %files -n rubygem-irb
 %{_bindir}/irb
 %{ruby_libdir}/irb*
 %{gem_dir}/gems/irb-%{irb_version}
+%ifnarch x86_64
 %{gem_dir}/specifications/irb-%{irb_version}.gemspec
+%endif
 %{_mandir}/man1/irb.1*
 
 %files -n rubygem-rdoc
 %{_bindir}/rdoc
 %{_bindir}/ri
 %{gem_dir}/gems/rdoc-%{rdoc_version}
+%ifnarch x86_64
 %{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
+%endif
 %{_mandir}/man1/ri*
 
 %files doc -f .ruby-doc.en -f .ruby-doc.ja
@@ -1098,31 +1130,41 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{ruby_libarchdir}/bigdecimal*
 %{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}
 %{gem_dir}/gems/bigdecimal-%{bigdecimal_version}
+%ifnarch x86_64
 %{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
+%endif
 
 %files -n rubygem-did_you_mean
+%ifnarch x86_64
 %{gem_dir}/gems/did_you_mean-%{did_you_mean_version}
 %exclude %{gem_dir}/gems/did_you_mean-%{did_you_mean_version}/.*
 %{gem_dir}/specifications/did_you_mean-%{did_you_mean_version}.gemspec
+%endif
 
 %files -n rubygem-io-console
 %{ruby_libdir}/io
 %{ruby_libarchdir}/io/console.so
 %{_libdir}/gems/%{name}/io-console-%{io_console_version}
 %{gem_dir}/gems/io-console-%{io_console_version}
+%ifnarch x86_64
 %{gem_dir}/specifications/io-console-%{io_console_version}.gemspec
+%endif
 
 %files -n rubygem-json
 %{ruby_libdir}/json*
 %{ruby_libarchdir}/json*
 %{_libdir}/gems/%{name}/json-%{json_version}
 %{gem_dir}/gems/json-%{json_version}
+%ifnarch x86_64
 %{gem_dir}/specifications/json-%{json_version}.gemspec
+%endif
 
 %files -n rubygem-minitest
+%ifnarch x86_64
 %{gem_dir}/gems/minitest-%{minitest_version}
 %exclude %{gem_dir}/gems/minitest-%{minitest_version}/.*
 %{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
+%endif
 
 %files -n rubygem-openssl
 %{ruby_libdir}/openssl
@@ -1130,12 +1172,16 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{ruby_libarchdir}/openssl.so
 %{_libdir}/gems/%{name}/openssl-%{openssl_version}
 %{gem_dir}/gems/openssl-%{openssl_version}
+%ifnarch x86_64
 %{gem_dir}/specifications/openssl-%{openssl_version}.gemspec
+%endif
 
 %files -n rubygem-power_assert
+%ifnarch x86_64
 %{gem_dir}/gems/power_assert-%{power_assert_version}
 %exclude %{gem_dir}/gems/power_assert-%{power_assert_version}/.*
 %{gem_dir}/specifications/power_assert-%{power_assert_version}.gemspec
+%endif
 
 %files -n rubygem-psych
 %{ruby_libdir}/psych
@@ -1143,18 +1189,25 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{ruby_libarchdir}/psych.so
 %{_libdir}/gems/%{name}/psych-%{psych_version}
 %{gem_dir}/gems/psych-%{psych_version}
+%ifnarch x86_64
 %{gem_dir}/specifications/psych-%{psych_version}.gemspec
+%endif
 
 %files -n rubygem-net-telnet
+%ifnarch x86_64
 %{gem_dir}/gems/net-telnet-%{net_telnet_version}
 %exclude %{gem_dir}/gems/net-telnet-%{net_telnet_version}/.*
 %{gem_dir}/specifications/net-telnet-%{net_telnet_version}.gemspec
+%endif
 
 %files -n rubygem-test-unit
+%ifnarch x86_64
 %{gem_dir}/gems/test-unit-%{test_unit_version}
 %{gem_dir}/specifications/test-unit-%{test_unit_version}.gemspec
+%endif
 
 %files -n rubygem-xmlrpc
+%ifnarch x86_64
 %license %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/LICENSE.txt
 %dir %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}
 %exclude %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/.*
@@ -1165,15 +1218,22 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/lib
 %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/xmlrpc.gemspec
 %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
+%endif
 
 %files -n rubygem-bundler
 %{_bindir}/bundle
 %{_bindir}/bundler
 %{gem_dir}/gems/bundler-%{bundler_version}
+%ifnarch x86_64
 %{gem_dir}/specifications/bundler-%{bundler_version}.gemspec
+%endif
 %{_mandir}/man1/bundle*.1*
 %{_mandir}/man5/gemfile.5*
 
+%ifarch x86_64
+%exclude /home/basebuilder/.gem/*
+%endif
+
 %changelog
 * Wed Oct 09 2019 Pavel Valena <pvalena@redhat.com> - 2.6.5-124
 - Update to Ruby 2.6.5.