diff --git a/.gitignore b/.gitignore
index 10e4703..ff84f66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,2 @@
-/pg-0.11.0.gem
-/pg-0.12.2.gem
-/pg-0.14.1.gem
-/pg-0.17.1.gem
-/pg-0.18.1.gem
-/pg-0.18.2.gem
-/pg-0.18.4.gem
-/pg-0.20.0.gem
-/pg-0.21.0.gem
-/pg-1.0.0.gem
-/pg-1.1.4.gem
-/pg-1.2.3.gem
+/pg-*.gem
+/pg-*-spec.tar.gz
diff --git a/.rubygem-pg.metadata b/.rubygem-pg.metadata
new file mode 100644
index 0000000..5b34a77
--- /dev/null
+++ b/.rubygem-pg.metadata
@@ -0,0 +1,2 @@
+3df45bb998f6988e2d0be56c1e99f6a70c43bee6 pg-1.3.5.gem
+77772374ea4a348408f640bd9aad195c509ad84a pg-1.3.5-spec.tar.gz
diff --git a/rubygem-pg-0.17.1-remove-rpath.patch b/rubygem-pg-0.17.1-remove-rpath.patch
deleted file mode 100644
index d947016..0000000
--- a/rubygem-pg-0.17.1-remove-rpath.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/ext/extconf.rb b/ext/extconf.rb
---- a/ext/extconf.rb
-+++ b/ext/extconf.rb
-@@ -33,13 +33,6 @@
- 		incdir = `"#{pgconfig}" --includedir`.chomp
- 		libdir = `"#{pgconfig}" --libdir`.chomp
- 		dir_config 'pg', incdir, libdir
--
--		# Try to use runtime path linker option, even if RbConfig doesn't know about it.
--		# The rpath option is usually set implicit by dir_config(), but so far not
--		# on MacOS-X.
--		if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', " -Wl,-rpath,#{libdir}")
--			$LDFLAGS << " -Wl,-rpath,#{libdir}"
--		end
- 	else
- 		$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
- 			" --with-pg-config=/path/to/pg_config"
diff --git a/rubygem-pg-1.3.0-remove-rpath.patch b/rubygem-pg-1.3.0-remove-rpath.patch
new file mode 100644
index 0000000..b3087ed
--- /dev/null
+++ b/rubygem-pg-1.3.0-remove-rpath.patch
@@ -0,0 +1,17 @@
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
+@@ -54,13 +54,6 @@
+ 	else
+ 		incdir, libdir = dir_config 'pg'
+ 		dlldir = libdir
+-	end
+-
+-	# Try to use runtime path linker option, even if RbConfig doesn't know about it.
+-	# The rpath option is usually set implicit by dir_config(), but so far not
+-	# on MacOS-X.
+-	if dlldir && RbConfig::CONFIG["RPATHFLAG"].to_s.empty?
+-		append_ldflags "-Wl,-rpath,#{dlldir.quote}"
+ 	end
+ end
+ 
diff --git a/rubygem-pg.spec b/rubygem-pg.spec
index a8ecb69..5c44859 100644
--- a/rubygem-pg.spec
+++ b/rubygem-pg.spec
@@ -2,7 +2,7 @@
 %global gem_name pg
 
 Name: rubygem-%{gem_name}
-Version: 1.2.3
+Version: 1.3.5
 Release: 1%{?dist}
 Summary: A Ruby interface to the PostgreSQL RDBMS
 # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/)
@@ -13,11 +13,16 @@ Summary: A Ruby interface to the PostgreSQL RDBMS
 License: (BSD or Ruby) and PostgreSQL
 URL: https://github.com/ged/ruby-pg
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
+# git clone --no-checkout https://github.com/ged/ruby-pg.git
+# git -C ruby-pg archive -v -o pg-1.3.5-spec.tar.gz v1.3.5 spec/
+Source1: %{gem_name}-%{version}-spec.tar.gz
 # Disable RPATH.
-# https://bitbucket.org/ged/ruby-pg/issue/183
-Patch0: rubygem-pg-0.17.1-remove-rpath.patch
-# Required in ext/pg_text_decoder.c
+# https://github.com/ged/ruby-pg/issues/183
+Patch0: rubygem-pg-1.3.0-remove-rpath.patch
+# ext/pg_text_decoder.c
 Requires: rubygem(bigdecimal)
+# lib/pg/text_{de,en}coder.rb
+Requires: rubygem(json)
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby-devel
@@ -31,7 +36,7 @@ BuildRequires: rubygem(rspec)
 
 %description
 This is the extension library to access a PostgreSQL database from Ruby.
-This library works with PostgreSQL 9.1 and later.
+This library works with PostgreSQL 9.3 and later.
 
 
 %package doc
@@ -43,7 +48,7 @@ BuildArch: noarch
 Documentation for %{name}.
 
 %prep
-%setup -q -n %{gem_name}-%{version}
+%setup -q -n %{gem_name}-%{version} -b 1
 
 %patch0 -p1
 
@@ -66,18 +71,19 @@ cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}
 # Prevent dangling symlink in -debuginfo (rhbz#878863).
 rm -rf %{buildroot}%{gem_instdir}/ext/
 
-# Remove useless shebangs.
-sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_instdir}/Rakefile
-sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_instdir}/Rakefile.cross
-
-# Files under %%{gem_libdir} are not executable.
-for file in `find %{buildroot}%{gem_libdir} -type f -name "*.rb"`; do
-    sed -i '/^#!\/usr\/bin\/env/ d' $file \
-    && chmod -v 644 $file
-done
 
 %check
 pushd .%{gem_instdir}
+ln -s %{_builddir}/spec .
+
+# Test failures with disabled netwrok.
+# https://github.com/ged/ruby-pg/issues/421
+sed -i -r 's|\\d\+\\\.\\d\+\\\.\\d\+\\\.\\d\+|(\0)?|' spec/pg/connection_spec.rb
+
+# Disable flaky test. This is problematic on most architectures.
+# https://github.com/ged/ruby-pg/issues/424
+sed -i -e '/it "needs to flush data after send_query" do/a\			skip' spec/pg/connection_spec.rb
+
 # Set --verbose to show detail log by $VERBOSE.
 # See https://github.com/ged/ruby-pg/blob/master/spec/helpers.rb $VERBOSE
 # Assign a random port to consider a case of multi builds in parallel in a host.
@@ -94,7 +100,7 @@ popd
 %files
 %dir %{gem_instdir}
 %{gem_extdir_mri}
-%exclude %{gem_instdir}/.gemtest
+%exclude %{gem_instdir}/.*
 %license %{gem_instdir}/BSDL
 %license %{gem_instdir}/POSTGRES
 %license %{gem_instdir}/LICENSE
@@ -104,18 +110,26 @@ popd
 
 %files doc
 %doc %{gem_docdir}
-%doc %{gem_instdir}/ChangeLog
 %doc %{gem_instdir}/Contributors.rdoc
+%{gem_instdir}/Gemfile
 %doc %{gem_instdir}/History.rdoc
 %doc %{gem_instdir}/Manifest.txt
 %doc %{gem_instdir}/README-OS_X.rdoc
 %doc %{gem_instdir}/README-Windows.rdoc
-%doc %{gem_instdir}/README.ja.rdoc
+%lang(ja) %doc %{gem_instdir}/README.ja.rdoc
 %doc %{gem_instdir}/README.rdoc
 %{gem_instdir}/Rakefile*
-%{gem_instdir}/spec
+%{gem_instdir}/rakelib/*
+%{gem_instdir}/certs
+%{gem_instdir}/misc
+%{gem_instdir}/pg.gemspec
+%{gem_instdir}/sample
 
 %changelog
+* Thu May 26 2022 Jarek Prokop - 1.3.5-1
+- Update to pg 1.3.5
+  Related: rhbz#2063773
+
 * Fri May 29 2020 Jun Aruga <jaruga@redhat.com> - 1.2.3-1
 - Update to pg 1.2.3 by merging Fedora master branch (commit: 5db4d26)
   Resolves: rhbz#1817135
diff --git a/sources b/sources
index 4a5b829..5652500 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-0daf487f7b63f240efcf2906c2345842  pg-1.2.3.gem
+SHA512 (pg-1.3.5.gem) = e603e0b8dceb710d1ad01352589a7aa1af3aa002379a0fa05d6183f99572ae5e4b3be5704d7910abdd450ee225ba84e699487571499c4640afdae2d4f809631a
+SHA512 (pg-1.3.5-spec.tar.gz) = 97f5203ff8ba5391c50913f4c08ca31b4b9571eb982d405e7e7408d512e4555c3a5a241282ea3ae26911a77bfa6c096ac7e9e7141529674225c85804c2dd7480