diff --git a/.gitignore b/.gitignore
index 6490ef4..8f5a03d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /pg-0.18.2.gem
 /pg-0.18.4.gem
 /pg-0.20.0.gem
+/pg-0.21.0.gem
diff --git a/rubygem-pg.spec b/rubygem-pg.spec
index f56be84..ffdb46e 100644
--- a/rubygem-pg.spec
+++ b/rubygem-pg.spec
@@ -2,8 +2,8 @@
 %global gem_name pg
 
 Name: rubygem-%{gem_name}
-Version: 0.20.0
-Release: 3%{?dist}
+Version: 0.21.0
+Release: 1%{?dist}
 Summary: A Ruby interface to the PostgreSQL RDBMS
 # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/)
 #
@@ -77,12 +77,6 @@ for file in `find %{buildroot}%{gem_libdir} -type f -name "*.rb"`; do
     && chmod -v 644 $file
 done
 
-# Fix shebangs and executable bits of samples.
-for file in `find %{buildroot}%{gem_instdir}/sample -type f -name "*.rb"`; do
-    sed -i -e '/^#!\/usr\/bin\/env/ s/.*/#!\/usr\/bin\/ruby/' $file \
-    && chmod -v 755 $file
-done
-
 # Fix spec shebangs.
 # https://bitbucket.org/ged/ruby-pg/issue/74/
 for file in `find %{buildroot}%{gem_instdir}/spec -type f ! -perm /a+x -name "*.rb"`; do
@@ -117,12 +111,13 @@ popd
 %doc %{gem_instdir}/README-Windows.rdoc
 %doc %{gem_instdir}/README.ja.rdoc
 %doc %{gem_instdir}/README.rdoc
-%{gem_instdir}/Rakefile
-%{gem_instdir}/Rakefile.cross
-%{gem_instdir}/sample
+%{gem_instdir}/Rakefile*
 %{gem_instdir}/spec
 
 %changelog
+* Thu Aug 17 2017 Vít Ondruch <vondruch@redhat.com> - 0.21.0-1
+- Update to pg 1.21.0.
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 4837935..5ef6319 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pg-0.20.0.gem) = 8c7ef2e3b0cb43f42b4f96c5995cd9ff8b01a0d0fc1cfd24d1053e27fa6d16f4eb7008fcb5f86445ad000429898df0215f7ee89b4da9500ddc4df04f5f2a10e2
+SHA512 (pg-0.21.0.gem) = 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b