diff --git a/rubygem-websocket-driver.spec b/rubygem-websocket-driver.spec
index 08184a3..94c7f51 100644
--- a/rubygem-websocket-driver.spec
+++ b/rubygem-websocket-driver.spec
@@ -2,23 +2,24 @@
 %global gem_name websocket-driver
 
 Name: rubygem-%{gem_name}
-Version: 0.3.4
-Release: 5%{?dist}
+Version: 0.6.4
+Release: 1%{?dist}
 Summary: WebSocket protocol handler with pluggable I/O
 Group: Development/Languages
 License: MIT
 URL: http://github.com/faye/websocket-driver-ruby
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # git clone https://github.com/faye/websocket-driver-ruby.git
-# cd websocket-driver-ruby && git checkout 0.3.4
-# tar czvf websocket-driver-ruby-0.3.4-tests.tgz spec/
-Source1: websocket-driver-ruby-0.3.4-tests.tgz
+# cd websocket-driver-ruby && git checkout 0.6.4
+# tar czvf websocket-driver-ruby-0.6.4-tests.tgz spec/
+Source1: websocket-driver-ruby-%{version}-tests.tgz
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby-devel
+BuildRequires: rubygem(websocket-extensions)
 BuildRequires: rubygem(eventmachine)
 BuildRequires: rubygem(rake-compiler)
-BuildRequires: rubygem(rspec) < 3.0
+BuildRequires: rubygem(rspec)
 
 %if 0%{?fedora} <= 20
 Requires: ruby(release)
@@ -74,7 +75,7 @@ tar xf %{SOURCE1}
 # Bundler
 sed -i -e '2d' examples/tcp_server.rb
 sed -i -e '2d' spec/spec_helper.rb
-rspec2 -I$(dirs +1)%{gem_extdir_mri} spec
+rspec -I$(dirs +1)%{gem_extdir_mri} spec
 popd
 
 %files
@@ -82,6 +83,8 @@ popd
 %{gem_libdir}
 %attr(0755, -, -) %{gem_extdir_mri}
 %exclude %{gem_cache}
+# Asking upstream to separate the license text.
+# https://github.com/faye/websocket-driver-ruby/issues/44
 %doc %{gem_instdir}/README.md
 %{gem_spec}
 
@@ -91,6 +94,9 @@ popd
 %{gem_instdir}/examples
 
 %changelog
+* Thu Jul 07 2016 Jun Aruga <jaruga@redhat.com> - 0.6.4-1
+- Update to websocket-driver 0.6.4.
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild