diff --git a/setup.cfg b/setup.cfg
index 2345eac78..3b9368752 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,8 +3,8 @@ name = diskimage-builder
 summary = Golden Disk Image builder.
 description-file =
     README.rst
-author = HP Cloud Services
-author_email = openstack-dev@lists.openstack.org
+author = OpenStack
+author-email = openstack-dev@lists.openstack.org
 license: Apache License (2.0)
 home-page = http://docs.openstack.org/developer/diskimage-builder/
 classifier =