diff --git a/.gitignore b/.gitignore
index 19de1e7..b6d95b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1 @@
-/clutter-gstreamer-2.2.4.gem
-/clutter-gstreamer-2.2.5.gem
-/clutter-gstreamer-3.0.4.gem
-/clutter-gstreamer-3.0.5.gem
-/clutter-gstreamer-3.0.7.gem
-/clutter-gstreamer-3.0.8.gem
-/clutter-gstreamer-3.0.9.gem
-/clutter-gstreamer-3.1.0.gem
-/clutter-gstreamer-3.1.1.gem
-/clutter-gstreamer-3.1.3.gem
-/clutter-gstreamer-3.1.6.gem
-/clutter-gstreamer-3.1.8.gem
-/clutter-gstreamer-3.1.9.gem
-/clutter-gstreamer-3.2.0.gem
-/clutter-gstreamer-3.2.1.gem
-/clutter-gstreamer-3.2.4.gem
-/clutter-gstreamer-3.2.5.gem
-/clutter-gstreamer-3.2.7.gem
-/clutter-gstreamer-3.2.9.gem
-/clutter-gstreamer-3.3.0.gem
-/clutter-gstreamer-3.3.1.gem
-/clutter-gstreamer-3.3.2.gem
-/clutter-gstreamer-3.3.6.gem
-/clutter-gstreamer-3.3.7.gem
-/clutter-gstreamer-3.4.0.gem
-/clutter-gstreamer-3.4.1.gem
-/clutter-gstreamer-3.4.3.gem
-/clutter-gstreamer-3.4.4.gem
-/clutter-gstreamer-3.4.7.gem
-/clutter-gstreamer-3.4.9.gem
+/clutter-gstreamer-*.gem
diff --git a/rubygem-clutter-gstreamer.spec b/rubygem-clutter-gstreamer.spec
index f1f3d1f..a186cd4 100644
--- a/rubygem-clutter-gstreamer.spec
+++ b/rubygem-clutter-gstreamer.spec
@@ -48,20 +48,19 @@ BuildArch:	noarch
 Documentation for %{name}.
 
 %prep
-gem unpack %{SOURCE0}
-%setup -q -D -T -n %{gem_name}-%{version}
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+%setup -q -n %{gem_name}-%{version}
+mv ../%{gem_name}-%{version}.gemspec .
 
 find . -name \*.rb -print0 | xargs --null chmod 0644
 
 # Adjust rubygems-gnome2 requirement to be more flexible
-sed -i -e 's|= 3\.4\.9|>= 3.4.9|' %{gem_name}.gemspec
+sed -i -e 's|= 3\.4\.9|>= 3.4.9|' %{gem_name}-%{version}.gemspec
 sed -i dependency-check/Rakefile \
 	-e '\@PKGConfig\.check_version@s|clutter-gst-3.0|glib-2.0|'
-sed -i -e '\@s\.extensions@d'  %{gem_name}.gemspec
+sed -i -e '\@s\.extensions@d'  %{gem_name}-%{version}.gemspec
 
 %build
-gem build %{gem_name}.gemspec
+gem build %{gem_name}-%{version}.gemspec
 %gem_install
 
 %install