diff --git a/python-ZODB.spec b/python-ZODB.spec
index 4669a1d..5771340 100644
--- a/python-ZODB.spec
+++ b/python-ZODB.spec
@@ -1,13 +1,11 @@
-%global srcname ZODB
-
-Name:           python-%{srcname}
-Version:        5.6.0
-Release:        6%{?dist}
+Name:           python-ZODB
+Version:        5.7.0
+Release:        1%{?dist}
 Summary:        Zope Object Database and persistence
 
 License:        ZPLv2.1
 URL:            https://www.zodb.org/
-Source0:        %pypi_source
+Source0:        %pypi_source ZODB
 BuildArch:      noarch
 
 BuildRequires:  make
@@ -17,7 +15,7 @@ BuildRequires:  python3-docs
 BuildRequires:  python3-persistent-devel
 BuildRequires:  python3-persistent-doc
 BuildRequires:  %{py3_dist btrees}
-BuildRequires:  %{py3_dist j1m.sphinxautozconfig}
+BuildRequires:  %{py3_dist j1m-sphinxautozconfig}
 BuildRequires:  %{py3_dist manuel}
 BuildRequires:  %{py3_dist pip}
 BuildRequires:  %{py3_dist pytest}
@@ -28,11 +26,11 @@ BuildRequires:  %{py3_dist sphinxcontrib-zopeext}
 BuildRequires:  %{py3_dist sphinx}
 BuildRequires:  %{py3_dist transaction}
 BuildRequires:  %{py3_dist wheel}
-BuildRequires:  %{py3_dist zc.lockfile}
+BuildRequires:  %{py3_dist zc-lockfile}
 BuildRequires:  %{py3_dist zconfig}
 BuildRequires:  %{py3_dist zodbpickle}
-BuildRequires:  %{py3_dist zope.testing}
-BuildRequires:  %{py3_dist zope.testrunner}
+BuildRequires:  %{py3_dist zope-testing}
+BuildRequires:  %{py3_dist zope-testrunner}
 
 %global common_desc                                                \
 The ZODB package provides a set of tools for using the Zope Object \
@@ -41,26 +39,26 @@ Database (ZODB).
 %description
 %{common_desc}
 
-%package -n python3-%{srcname}
+%package -n python3-ZODB
 Summary:        Zope Object Database and persistence
 
-%description -n python3-%{srcname}
+%description -n python3-ZODB
 %{common_desc}
 
 %package doc
-Summary:        Documentation for %{srcname}
+Summary:        Documentation for ZODB
 
 %description doc
-Documentation for %{srcname}.
+Documentation for ZODB.
 
 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -n ZODB-%{version}
 
 # Use local objects.inv for intersphinx
 sed -e "s|\('https://docs\.python\.org/3/', \)None|\1'%{_docdir}/python3-docs/html/objects.inv'|" \
     -e "s|\('https://persistent\.readthedocs\.io/en/latest/', \)None|\1'%{_docdir}/python3-persistent-doc/objects.inv'|" \
     -e "s|\(\"https://btrees\.readthedocs\.io/en/latest/\", \)None|\1'%{_docdir}/python-BTrees-doc/objects.inv'|" \
-    -i doc/conf.py
+    -i docs/conf.py
 
 # Fix shebangs
 %py3_shebang_fix src/ZODB/scripts
@@ -69,31 +67,33 @@ sed -e "s|\('https://docs\.python\.org/3/', \)None|\1'%{_docdir}/python3-docs/ht
 %pyproject_wheel
 
 # Build the documentation
-cp -p doc/.static/zodb.ico doc
-make -C doc html SPHINXBUILD=%{_bindir}/sphinx-build PYTHONPATH=$PWD/src
-rm doc/build/html/.buildinfo
+cp -p docs/.static/zodb.ico doc
+make -C docs html SPHINXBUILD=%{_bindir}/sphinx-build PYTHONPATH=$PWD/src
+rm docs/build/html/.buildinfo
 rst2html --no-datestamp CHANGES.rst CHANGES.html
 
 %install
 %pyproject_install
+%pyproject_save_files ZODB
 
 %check
 %pytest
 
-%files -n python3-%{srcname}
-%license COPYRIGHT.txt LICENSE.txt
+%files -n python3-ZODB -f %{pyproject_files}
 %doc CHANGES.html
 %{_bindir}/fsdump
 %{_bindir}/fsoids
 %{_bindir}/fsrefs
 %{_bindir}/fstail
 %{_bindir}/repozo
-%{python3_sitelib}/%{srcname}*
 
 %files doc
-%doc doc/build/html
+%doc docs/build/html
 
 %changelog
+* Sat Mar 19 2022 Jerry James <loganjerry@gmail.com> - 5.7.0-1
+- Version 5.7.0
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 92b6b58..3b7bde6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ZODB-5.6.0.tar.gz) = 85c8bdb405300bda0455721f6839fc63bf88b8a54180f0818d08b09042b757d529a5d2df8b477e796fbb9cce88ad7ab7dc27c963071c67b7c09e01c2ae02820c
+SHA512 (ZODB-5.7.0.tar.gz) = 20cdbcf4512817dc153f08ceead3fc6aeaf2108c08048e44ad7ee160ed1a0224817ba538b4d5cf5860e6494a57b48c8c23175eb2a774712a316d0450deda0c9d