diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec
index 2452f1e..004bd71 100644
--- a/rubygem-rspec-support.spec
+++ b/rubygem-rspec-support.spec
@@ -3,7 +3,7 @@
 %global	mainver	3.5.0
 %undefine	prever
 
-%global	mainrel	2
+%global	mainrel	3
 %global	prerpmver	%(echo "%{?prever}" | sed -e 's|\\.||g')
 
 %global	need_bootstrap_set	0
@@ -56,15 +56,12 @@ Documentation for %{name}
 %global	version	%{version_orig}%{?prever}
 
 %prep
-gem unpack %{SOURCE0}
-%setup -q -D -T -n  %{gem_name}-%{version} -a 1
+%setup -q -T -n %{gem_name}-%{version} -b 1
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
-( 
-cd %{gem_name}-%{version}
 %patch0 -p1
 %patch1 -p1
-)
+%patch2 -p1
 
 %build
 gem build %{gem_name}.gemspec
@@ -78,9 +75,6 @@ cp -pa .%{gem_dir}/* \
 %if 0%{?need_bootstrap_set} < 1
 %check
 LANG=en_US.UTF-8
-pushd %{gem_name}-%{version}
-
-cat %{PATCH2} | patch -p1
 
 # Test failure needs investigation...
 FAILFILE=()
@@ -98,8 +92,6 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) {
 
 ruby -rubygems -Ilib/ -S rspec spec/ || \
 	ruby -rubygems -Ilib/ -S rspec --tag ~broken
-
-popd
 %endif
 
 %files
@@ -116,6 +108,10 @@ popd
 %doc	%{gem_docdir}
 
 %changelog
+* Tue Feb 21 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.0-3
+- Always use full tar.gz for installed files and
+  keep using gem file for gem spec (ref: bug 1425220)
+
 * Fri Feb 03 2017 Jun Aruga <jaruga@redhat.com> - 3.5.0-2
 - Fix for Ruby 2.4.0 compatibility.