diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 25ff1bcc70..bbffc24479 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -109,7 +109,7 @@ advocate for your change and iterate on it based on feedback. Reach out
 to other people working on the project on
 `IRC <http://eavesdrop.openstack.org/irclogs/%23openstack-swift/>`__ or
 the `mailing
-list <http://lists.openstack.org/pipermail/openstack-dev/>`__ - we want
+list <http://lists.openstack.org/pipermail/openstack-discuss/>`__ - we want
 to help.
 
 Recommended workflow
diff --git a/setup.cfg b/setup.cfg
index 52385f3da9..ed9fb89fce 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,7 +4,7 @@ summary = OpenStack Object Storage
 description-file =
     README.rst
 author = OpenStack
-author-email = openstack-dev@lists.openstack.org
+author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/swift/latest/
 classifier =
     Development Status :: 5 - Production/Stable