diff --git a/.gitignore b/.gitignore
index b15139c..752b2c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ thin-1.2.5.gem
 /thin-1.5.0.gem
 /thin-1.6.2-tests.tgz
 /thin-1.6.2.gem
+/thin-1.6.4-tests.tgz
+/thin-1.6.4.gem
diff --git a/rubygem-thin.spec b/rubygem-thin.spec
index a3bbe2f..b040748 100644
--- a/rubygem-thin.spec
+++ b/rubygem-thin.spec
@@ -1,22 +1,21 @@
 %global gem_name thin
 
-Summary: A thin and fast web server
 Name: rubygem-%{gem_name}
-Version: 1.6.2
-Release: 5%{?dist}
+Version: 1.6.4
+Release: 1%{?dist}
+Summary: A thin and fast web server
 Group: Development/Languages
 License: (GPLv2 or Ruby) and MIT
 URL: http://code.macournoyer.com/thin/
-Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-# git clone https://github.com/macournoyer/thin.git && cd thin && git checkout v1.6.2
-# tar czvf thin-1.6.2-tests.tgz spec/
+Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
+# git clone https://github.com/macournoyer/thin.git && cd thing
+# git checkout v1.6.4 && tar czvf thin-1.6.4-tests.tgz spec/
 Source1: %{gem_name}-%{version}-tests.tgz
 # https://github.com/macournoyer/thin/issues/76
 Patch3: rubygem-thin-fix-install-spec.patch
-Requires: curl
 BuildRequires: ruby(release)
-BuildRequires: ruby-devel
 BuildRequires: rubygems-devel
+BuildRequires: ruby-devel
 %if 0%{?fedora} >= 22
 BuildRequires: rubygem(rspec2)
 %else
@@ -36,10 +35,11 @@ Rack, a minimal interface between webservers and Ruby frameworks.
 %package doc
 Summary: Documentation for %{name}
 Group: Documentation
-Requires:%{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
 
 %description doc
-Documentation for %{name}
+Documentation for %{name}.
 
 %prep
 %setup -q -c -T
@@ -49,15 +49,14 @@ Documentation for %{name}
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
-cp -pa .%{gem_dir}/* \
+cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
 mkdir -p %{buildroot}%{gem_extdir_mri}
 cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
 
-# Prevent dangling symlink in -debuginfo.
-rm -rf %{buildroot}%{gem_instdir}/ext
-
+# Prevent dangling symlink in -debuginfo (rhbz#878863).
+rm -rf %{buildroot}%{gem_instdir}/ext/
 
 mkdir -p %{buildroot}%{_bindir}
 cp -pa .%{_bindir}/* \
@@ -77,6 +76,7 @@ tar xzvf %{SOURCE1}
 
 # Depends on rubygem-benchmark_unit, not available in Fedora yet.
 rm -rf spec/perf
+
 # The 'should force kill process in pid file' spec is not compatible with RSpec2.
 # https://github.com/rspec/rspec-core/issues/520
 sed -i "/'should force kill process in pid file'/a \    pending" spec/daemonizing_spec.rb
@@ -85,9 +85,6 @@ sed -i "/'should force kill process in pid file'/a \    pending" spec/daemonizin
 # whole testsuite.
 sed -i '/"tracing routines (with NO custom logger)"/a \    before { pending }' spec/logging_spec.rb
 
-# https://github.com/macournoyer/thin/issues/232
-sed -i '/"should close body tempfile when closing"/a \    pending' spec/request/processing_spec.rb
-
 cat %{PATCH3} | patch -p1
 
 %if 0%{?fedora} >= 22
@@ -95,14 +92,13 @@ rspec2 \
 %else
 rspec \
 %endif
-	-I$(dirs +1)%{gem_extdir_mri} spec
+  -I$(dirs +1)%{gem_extdir_mri} spec
 
 popd
 
 %files
-%{gem_instdir}/README.md
-%{_bindir}/%{gem_name}
 %dir %{gem_instdir}
+%{_bindir}/thin
 %{gem_instdir}/bin
 %dir %{gem_libdir}
 %{gem_libdir}/thin.rb
@@ -118,12 +114,16 @@ popd
 %{gem_spec}
 
 %files doc
-%{gem_docdir}
+%doc %{gem_docdir}
 %{gem_instdir}/example/
-%{gem_instdir}/CHANGELOG
+%doc %{gem_instdir}/CHANGELOG
+%doc %{gem_instdir}/README.md
 %{gem_instdir}/Rakefile
 
 %changelog
+* Tue Oct 20 2015 Vít Ondruch <vondruch@redhat.com> - 1.6.4-1
+- Update to Thin 1.6.4.
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index b4d1c4c..69ec502 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-975602aca286ad6cbd307ab2883c07ef  thin-1.6.2-tests.tgz
-f7c58c6fba07147bb4382115d303a2ac  thin-1.6.2.gem
+b807c2c8e0fa8a0dc8016e06ec7d72c2  thin-1.6.4-tests.tgz
+70a111347b9955ae13faeb388f22fd68  thin-1.6.4.gem