diff --git a/.gitignore b/.gitignore
index 0ee36e3..a17e8ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /backports-3.3.4.gem
 /backports-3.6.0.gem
+/backports-3.6.4.gem
diff --git a/rubygem-backports.spec b/rubygem-backports.spec
index 80b6f6d..12bde2f 100644
--- a/rubygem-backports.spec
+++ b/rubygem-backports.spec
@@ -2,8 +2,8 @@
 %global gem_name backports
 
 Name: rubygem-%{gem_name}
-Version: 3.6.0
-Release: 2%{?dist}
+Version: 3.6.4
+Release: 1%{?dist}
 Summary: Backports of Ruby features for older Ruby
 Group: Development/Languages
 License: MIT
@@ -18,7 +18,7 @@ BuildArch: noarch
 
 %description
 Essential backports that enable many of the nice features of Ruby 1.8.7 up to
-2.0.0 for earlier versions.
+2.1.0 for earlier versions.
 
 
 %package doc
@@ -44,7 +44,7 @@ gem build %{gem_name}.gemspec
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
-cp -pa .%{gem_dir}/* \
+cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
 %check
@@ -67,15 +67,19 @@ ruby -rminitest/autorun -Ilib - << \EOF
 
   module Minitest::Assertions; alias :assert_raise :assert_raises; end;
 
+  # Some test cases needs to run in order, while recent Minitest runs it in random order.
+  class AAA_TestBackportGuards < MiniTest::Unit::TestCase; def self.test_order; :alpha; end; end;
+
   Dir.glob "./test/*_test.rb", &method(:require)
 EOF
+
 popd
 
 
 %files
-%doc %{gem_instdir}/LICENSE.txt
-%exclude %{gem_instdir}/.*
 %dir %{gem_instdir}
+%exclude %{gem_instdir}/.*
+%license %{gem_instdir}/LICENSE.txt
 %{gem_libdir}
 %exclude %{gem_cache}
 %{gem_spec}
@@ -84,16 +88,18 @@ popd
 %doc %{gem_docdir}
 %doc %{gem_instdir}/CHANGELOG.rdoc
 %{gem_instdir}/Gemfile*
-%{gem_instdir}/Rakefile
 %doc %{gem_instdir}/README.rdoc
+%{gem_instdir}/Rakefile
 %{gem_instdir}/backports.gemspec
 %{gem_instdir}/default.mspec
 %{gem_instdir}/set_version
 %{gem_instdir}/spec
 %{gem_instdir}/test
-%doc %{gem_instdir}/test/README
 
 %changelog
+* Mon Jun 22 2015 Vít Ondruch <vondruch@redhat.com> - 3.6.4-1
+- Update to backports 3.6.4.
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 331f70e..f990f7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed35fa0768303d6ec558b4d492ab6338  backports-3.6.0.gem
+2423fcf368bf24af46c57464b80d8e2f  backports-3.6.4.gem