diff --git a/.gitignore b/.gitignore
index 52ea47f..70c5fc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /aruba-0.4.11.gem
 /aruba-0.5.2.gem
+/aruba-0.5.4.gem
diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec
index a43f287..5286428 100644
--- a/rubygem-aruba.spec
+++ b/rubygem-aruba.spec
@@ -3,8 +3,8 @@
 
 Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba
 Name: rubygem-%{gem_name}
-Version: 0.5.2
-Release: 2%{?dist}
+Version: 0.5.4
+Release: 1%{?dist}
 Group: Development/Languages
 # aruba itself is MIT
 # icons in templates/images are CC-BY
@@ -17,15 +17,12 @@ Requires: ruby(release)
 Requires: ruby(rubygems) 
 Requires: rubygem(cucumber) >= 1.1.1
 Requires: rubygem(childprocess) >= 0.2.0
-# Doesn't work with ffi 1.0.10, see https://github.com/cucumber/aruba/issues/114
-Conflicts: rubygem(ffi) = 1.0.10
-Requires: rubygem(rspec) >= 2.7.0
+Requires: rubygem(rspec-expectations) >= 2.7.0
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby
 BuildRequires: rubygem(cucumber) >= 1.1.1
 BuildRequires: rubygem(childprocess) >= 0.2.0
-BuildConflicts: rubygem(ffi) = 1.0.10
 BuildRequires: rubygem(rspec) >= 2.7.0
 # used in one of the features
 BuildRequires: bc
@@ -86,6 +83,9 @@ popd
 %{gem_instdir}/templates
 
 %changelog
+* Wed May 14 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.4-1
+- 0.5.4
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 334b95d..1841132 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e048f42c74d41f6587bfdec83bec7a31  aruba-0.5.2.gem
+d8b5248923e7767f99805bacc4d432cc  aruba-0.5.4.gem