diff --git a/setup.cfg b/setup.cfg
index 97fcfea3..5a5160db 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,18 +1,16 @@
 [metadata]
 name = pbr
 author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
-summary = Python Build Reasonableness
-description-file =
-    README.rst
-description-content-type = text/x-rst; charset=UTF-8
-home-page = https://docs.openstack.org/pbr/latest/
+author_email = openstack-discuss@lists.openstack.org
+description = Python Build Reasonableness
+long_description = file: README.rst
+long_description_content_type = text/x-rst; charset=UTF-8
+url = https://docs.openstack.org/pbr/latest/
 project_urls =
     Bug Tracker = https://bugs.launchpad.net/pbr/
     Documentation = https://docs.openstack.org/pbr/
     Source Code = https://opendev.org/openstack/pbr
-python-requires = >=2.6
-classifier =
+classifiers =
     Development Status :: 5 - Production/Stable
     Environment :: Console
     Environment :: OpenStack
@@ -28,6 +26,9 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
 
+[options]
+python_requires = >=2.6
+
 [files]
 packages =
     pbr