diff --git a/.gitignore b/.gitignore
index 236e4d3..10f93f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /3.0.11.tar.gz
 /3.0.16.tar.gz
 /3.1.7.tar.gz
+/3.1.8.tar.gz
diff --git a/python-psycopg3.spec b/python-psycopg3.spec
index e1c943f..cd77adf 100644
--- a/python-psycopg3.spec
+++ b/python-psycopg3.spec
@@ -7,7 +7,7 @@ any other DB-API 2.0 database adapter, but allows to use more modern PostgreSQL
 and Python features.}
 
 Name:		python-%{src_name}
-Version:	3.1.7
+Version:	3.1.8
 Release:	1%{?dist}
 Summary:	Psycopg 3 is a modern implementation of a PostgreSQL adapter for Python
 
@@ -71,6 +71,9 @@ export PSYCOPG_TEST_DSN="host=$PGHOST port=$PGPORT dbname=${PGTESTS_DATABASES##*
 
 
 %changelog
+* Fri Jan 20 2023 Ondrej Sloup <osloup@redhat.com>  - 3.1.8-1
+- Rebase to the latest upstream version (rhbz#2161450)
+
 * Wed Dec 21 2022 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 3.1.7-1
 - Release bump rhbz#2155285
 - Enable postgresql server for tests
diff --git a/sources b/sources
index 42f4092..0c73046 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (3.1.7.tar.gz) = a3be0074e38953bf2b08ac6892d3a7a98bb9ef3e5ab1183d65e7d2aa14c5b148b625dc1da1d830bb6b9cd17d6726b9348fa32415413ed48bba6dd6bd31521432
+SHA512 (3.1.8.tar.gz) = 4424305debc7b055fcd19b27714df46d54f8ae38452d8d5a3276df70a6c27e0094081020fdf2c34c73275cb058054414ac80843bb3e6a841bb3556ce39c76287