diff --git a/.gitignore b/.gitignore
index e70091d..c48f4ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 gem2rpm-0.6.0.gem
+/gem2rpm-0.7.1.gem
+/gem2rpm-tests.tgz
diff --git a/rubygem-gem2rpm.spec b/rubygem-gem2rpm.spec
index 3dcc564..85e084f 100644
--- a/rubygem-gem2rpm.spec
+++ b/rubygem-gem2rpm.spec
@@ -1,20 +1,31 @@
 # Generated from gem2rpm-0.5.2.gem by gem2rpm -*- rpm-spec -*-
-%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname gem2rpm
-%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%define gemdocdir %{gemdir}/doc/%{gemname}-%{version}
+%global gemname gem2rpm
+
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global gemdocdir %{gemdir}/doc/%{gemname}-%{version}
+%global rubyabi 1.8
 
 Summary: Generate rpm specfiles from gems
 Name: rubygem-%{gemname}
-Version: 0.6.0
-Release: 6%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
-URL: http://rubyforge.org/projects/gem2rpm/
-Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+%if 0%{?rhel} <= 5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rubygems
-BuildRequires: rubygems
+%endif
+URL: https://github.com/lutter/gem2rpm/
+Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+# git clone https://github.com/lutter/gem2rpm.git && cd gem2rpm && git checkout v0.7.0
+# tar czvf gem2rpm-tests.tgz test/
+Source1: %{gemname}-tests.tgz
+Requires: ruby(abi) = %{rubyabi}
+Requires: ruby(rubygems)
+Requires: ruby
+BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby(rubygems)
+BuildRequires: ruby
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -28,45 +39,57 @@ Fedora rubygem packaging guidelines
 Summary:           Documentation for %{name}
 Group:             Documentation
 Requires:          %{name} = %{version}-%{release}
+BuildArch: noarch
 
 %description doc
 Documentation for %{name}.
 
 %prep
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            --bindir .%{_bindir} \
+            --force %{SOURCE0}
 
 %build
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
-            --force %{SOURCE0}
-mkdir -p %{buildroot}/%{_bindir}
-mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
-rmdir %{buildroot}%{gemdir}/bin
+cp -a .%{gemdir}/* \
+        %{buildroot}%{gemdir}/
+
+mkdir -p %{buildroot}%{_bindir}
+cp -a .%{_bindir}/* \
+        %{buildroot}%{_bindir}/
+
 find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
-rm -f %{buildroot}%{geminstdir}/*.spec
 
-%clean
-rm -rf %{buildroot}
+%check
+tar xzvf %{SOURCE1} -C .%{geminstdir}
+pushd .%{geminstdir}
+RUBYOPT=Itest testrb test/
+popd
 
 %files
-%defattr(-, root, root, -)
-%{_bindir}/gem2rpm
 %dir %{geminstdir}
-%doc %{geminstdir}/AUTHORS
+%{_bindir}/gem2rpm
 %{geminstdir}/bin
 %{geminstdir}/lib
-%doc %{geminstdir}/README
+%{geminstdir}/templates
 %doc %{geminstdir}/LICENSE
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %files doc
-%doc %{gemdocdir}/rdoc
-%doc %{gemdocdir}/ri
+%doc %{gemdocdir}
+%doc %{geminstdir}/README
+%doc %{geminstdir}/AUTHORS
 
 %changelog
+* Thu Jun 30 2011 Vít Ondruch <vondruch@redhat.com> - 0.7.1-1
+- Updated to the 0.7.1 version.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index d160712..6397ba1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-0769044118df0d62f83d171abae3f006  gem2rpm-0.6.0.gem
+5c96a9ada7a1136eea0f00ffb8833307  gem2rpm-0.7.1.gem
+b8f66ad790466d192c3ffaf8901ff3d3  gem2rpm-tests.tgz