diff --git a/python-spake2.changes b/python-spake2.changes
index 95b3167..a8d47a6 100644
--- a/python-spake2.changes
+++ b/python-spake2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 20 01:20:49 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch support-python-312.patch:
+  * Support Python 3.12 changes.
+- Switch to pyproject and autosetup macros.
+
 -------------------------------------------------------------------
 Tue Sep 19 11:12:39 UTC 2023 - Ondřej Súkup <mimi.vx@gmail.com>
 
diff --git a/python-spake2.spec b/python-spake2.spec
index 424e9e5..41fe4ea 100644
--- a/python-spake2.spec
+++ b/python-spake2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-spake2
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,12 +21,15 @@ Version:        0.8
 Release:        0
 Summary:        Pure-Python SPAKE2
 License:        MIT
-Group:          Development/Languages/Python
 URL:            http://github.com/warner/python-spake2
 Source:         https://files.pythonhosted.org/packages/source/s/spake2/spake2-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM gh#warner/python-spake2#16
+Patch0:         support-python-312.patch
 BuildRequires:  %{python_module hkdf}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-hkdf
@@ -37,13 +40,13 @@ BuildArch:      noarch
 SPAKE2 password-authenticated key exchange.
 
 %prep
-%setup -q -n spake2-%{version}
+%autosetup -p1 -n spake2-%{version}
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
@@ -52,6 +55,6 @@ SPAKE2 password-authenticated key exchange.
 %files %{python_files}
 %license LICENSE
 %{python_sitelib}/spake2
-%{python_sitelib}/spake2-%{version}*-info
+%{python_sitelib}/spake2-%{version}.dist-info
 
 %changelog
diff --git a/support-python-312.patch b/support-python-312.patch
new file mode 100644
index 0000000..b63c602
--- /dev/null
+++ b/support-python-312.patch
@@ -0,0 +1,25 @@
+From 1b04d33106b105207c97c64b2589c45790720b0b Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <wiz@gatalith.at>
+Date: Wed, 25 Oct 2023 12:32:02 +0200
+Subject: [PATCH] Fix build with Python 3.12.
+
+---
+ versioneer.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/versioneer.py b/versioneer.py
+index 64fea1c..3aa5da3 100644
+--- a/versioneer.py
++++ b/versioneer.py
+@@ -339,9 +339,9 @@ def get_config_from_root(root):
+     # configparser.NoOptionError (if it lacks "VCS="). See the docstring at
+     # the top of versioneer.py for instructions on writing your setup.cfg .
+     setup_cfg = os.path.join(root, "setup.cfg")
+-    parser = configparser.SafeConfigParser()
++    parser = configparser.ConfigParser()
+     with open(setup_cfg, "r") as f:
+-        parser.readfp(f)
++        parser.read_file(f)
+     VCS = parser.get("versioneer", "VCS")  # mandatory
+ 
+     def get(parser, name):