diff --git a/.gitignore b/.gitignore
index 532d5c7..8bc1827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /fssm-0.2.2.gem
+/fssm-0.2.6.1.gem
diff --git a/rubygem-fssm.spec b/rubygem-fssm.spec
index 6b9345a..2d62aa7 100644
--- a/rubygem-fssm.spec
+++ b/rubygem-fssm.spec
@@ -4,18 +4,18 @@
 
 Summary: File system state monitor
 Name: rubygem-%{gemname}
-Version: 0.2.2
-Release: 4%{?dist}
+Version: 0.2.6.1
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/ttilley/fssm
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ruby(abi) = 1.8
 Requires: rubygems
-Requires: rubygem(rspec)
+BuildRequires: ruby(abi) = 1.8
 BuildRequires: rubygems
-BuildRequires: rubygem(rspec)
+# Use rspec-core until rspec are not migrated to RSpec 2.x
+BuildRequires: rubygem(rspec-core)
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -35,31 +35,35 @@ Requires:%{name} = %{version}-%{release}
 Documentation for %{name}
 
 %prep
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            --force --rdoc %{SOURCE0}
 
 %build
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
-            --force --rdoc %{SOURCE0}
+cp -a .%{gemdir}/* \
+        %{buildroot}%{gemdir}/
 
-rm %{buildroot}/%{geminstdir}/.document
+rm %{buildroot}/%{geminstdir}/.gitignore
 
 %check
-pushd %{buildroot}/%{geminstdir}
-%_bindir/spec spec
+pushd .%{geminstdir}
+
+# Remove Bundler dependency
+sed -i '4,+1d' spec/spec_helper.rb
+
+rspec spec/
 popd
 
 %clean
-rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
 %dir %{geminstdir}
 %{geminstdir}/lib/
-%{geminstdir}/Rakefile
-%{geminstdir}/VERSION.yml
 %doc %{geminstdir}/LICENSE
 %doc %{geminstdir}/README.markdown
 %{gemdir}/cache/%{gemname}-%{version}.gem
@@ -69,11 +73,19 @@ rm -rf %{buildroot}
 %defattr(-, root, root, -)
 %{geminstdir}/example.rb
 %{geminstdir}/%{gemname}.gemspec
+%{geminstdir}/Gemfile
+%{geminstdir}/Rakefile
 %{geminstdir}/profile/
 %{geminstdir}/spec/
 %doc %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Tue Apr 05 2011 Vít Ondruch <vondruch@redhat.com> - 0.2.6.1-1
+- Updated to fssm 0.2.6.1
+- Removed obsolete BuildRoot.
+- Removed unnecessary cleanup.
+- Testsuite executed using RSpec 2.x.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index e4cfae2..c9e27a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a1ea465f0a86ed59e150ebf91193b19  fssm-0.2.2.gem
+8c217622f0e28ed4b25406d765287575  fssm-0.2.6.1.gem