diff --git a/.gitignore b/.gitignore
index c5aa11a..992cf75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ rake-compiler-0.7.1.gem
 /rake-compiler-0.7.7.gem
 /rake-compiler-0.7.8.gem
 /rake-compiler-0.7.9.gem
+/rake-compiler-0.8.0.gem
+/rake-compiler-0.8.1.gem
diff --git a/rubygem-rake-compiler.spec b/rubygem-rake-compiler.spec
index b369768..d5c82ad 100644
--- a/rubygem-rake-compiler.spec
+++ b/rubygem-rake-compiler.spec
@@ -1,13 +1,24 @@
 %global	gemname	rake-compiler
-%global	gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global	geminstdir	%{gemdir}/gems/%{gemname}-%{version}
+%global	gem_name	%{gemname}
+%global	gemdir		%{gem_dir}
+%global	geminstdir	%{gem_instdir}
 
 %global	rubyabi	1.8
 
+%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7}
+%global	gemdir	%{gem_dir}
+%global	gem_name	%{gemname}
+%global	geminstdir	%{gem_instdir}
+%global	rubyabi	1.9.1
+%global	ruby19	1
+%else
+%global	ruby19	0
+%endif
+
 Summary:	Rake-based Ruby C Extension task generator
 Name:		rubygem-%{gemname}
-Version:	0.7.9
-Release:	2%{?dist}
+Version:	0.8.1
+Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://rake-compiler.rubyforge.org/
@@ -15,11 +26,12 @@ Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	ruby(rubygems) >= 1.3.5
-BuildRequires:	rubygem(cucumber)
-BuildRequires:	rubygem(isolate)
-BuildRequires:	rubygem(rake)
+#BuildRequires:	rubygem(cucumber)
+#BuildRequires:	rubygem(isolate)
+#BuildRequires:	rubygem(rake)
 #BuildRequires:	rubygem(rcov)
 BuildRequires:	rubygem(rspec-core)
+BuildRequires:	rubygems-devel
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	ruby(rubygems) >= 1.3.5
 Requires:	rubygem(rake) >= 0.8.3
@@ -124,6 +136,21 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Apr 16 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.8.1-1
+- 0.8.1
+
+* Tue Apr 03 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 0.8.0-3
+- Fix conditionals for F17 to work for RHEL 7 as well.
+
+* Sun Jan 22 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.8.0-2
+- Rebuild against ruby 1.9
+
+* Sun Jan 15 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.8.0-1
+- 0.8.0
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.9-3
+- F-17: Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue Jul 26 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.7.9-2
 - Kill BR: rubygem(rcov) for now
 
diff --git a/sources b/sources
index d0f19ac..0837af9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca229b3cb7797e0f189eccfd98aecdb4  rake-compiler-0.7.9.gem
+c44536e13a9ad4898563b295194f7809  rake-compiler-0.8.1.gem