diff --git a/.gitignore b/.gitignore
index fc4531c4c..dc3c1de6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,10 @@ output/*/index.html
 # Sphinx
 doc/build
 
+# pbr generates these
+AUTHORS
+ChangeLog
+
 # Editors
 *~
 .*.swp
diff --git a/requirements.txt b/requirements.txt
index 975523f37..7cab55048 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+pbr>=2.0 # Apache-2.0
 # Ansible 2.3 has a bug (#30350) in the Dell network modules. Pull in a version
 # with the fix backported. It can be installed by uncommenting the following
 # line and commenting the one after.
diff --git a/setup.cfg b/setup.cfg
index b1ce8f4fe..563dabcd0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,50 @@ classifier =
 packages =
     kayobe
 
+[entry_points]
+console_scripts=
+    kayobe = kayobe.cmd.kayobe:main
+    kayobe-vault-password-helper = kayobe.cmd.kayobe_vault_password_helper:main
+
+kayobe.cli=
+    baremetal_compute_inspect = kayobe.cli.commands:BaremetalComputeInspect
+    baremetal_compute_manage = kayobe.cli.commands:BaremetalComputeManage
+    baremetal_compute_provide = kayobe.cli.commands:BaremetalComputeProvide
+    control_host_bootstrap = kayobe.cli.commands:ControlHostBootstrap
+    control_host_upgrade = kayobe.cli.commands:ControlHostUpgrade
+    configuration_dump = kayobe.cli.commands:ConfigurationDump
+    kolla_ansible_run = kayobe.cli.commands:KollaAnsibleRun
+    network_connectivity_check = kayobe.cli.commands:NetworkConnectivityCheck
+    overcloud_bios_raid_configure = kayobe.cli.commands:OvercloudBIOSRAIDConfigure
+    overcloud_container_image_build = kayobe.cli.commands:OvercloudContainerImageBuild
+    overcloud_container_image_pull = kayobe.cli.commands:OvercloudContainerImagePull
+    overcloud_deployment_image_build = kayobe.cli.commands:OvercloudDeploymentImageBuild
+    overcloud_deprovision = kayobe.cli.commands:OvercloudDeprovision
+    overcloud_hardware_inspect = kayobe.cli.commands:OvercloudHardwareInspect
+    overcloud_host_configure = kayobe.cli.commands:OvercloudHostConfigure
+    overcloud_host_upgrade = kayobe.cli.commands:OvercloudHostUpgrade
+    overcloud_introspection_data_save = kayobe.cli.commands:OvercloudIntrospectionDataSave
+    overcloud_inventory_discover = kayobe.cli.commands:OvercloudInventoryDiscover
+    overcloud_post_configure = kayobe.cli.commands:OvercloudPostConfigure
+    overcloud_provision = kayobe.cli.commands:OvercloudProvision
+    overcloud_service_configuration save = kayobe.cli.commands:OvercloudServiceConfigurationSave
+    overcloud_service_configuration generate = kayobe.cli.commands:OvercloudServiceConfigurationGenerate
+    overcloud_service_deploy = kayobe.cli.commands:OvercloudServiceDeploy
+    overcloud_service_destroy = kayobe.cli.commands:OvercloudServiceDestroy
+    overcloud_service_reconfigure = kayobe.cli.commands:OvercloudServiceReconfigure
+    overcloud_service_upgrade = kayobe.cli.commands:OvercloudServiceUpgrade
+    physical_network_configure = kayobe.cli.commands:PhysicalNetworkConfigure
+    playbook_run = kayobe.cli.commands:PlaybookRun
+    seed_container_image_build = kayobe.cli.commands:SeedContainerImageBuild
+    seed_deployment_image_build = kayobe.cli.commands:SeedDeploymentImageBuild
+    seed_host_configure = kayobe.cli.commands:SeedHostConfigure
+    seed_host_upgrade = kayobe.cli.commands:SeedHostUpgrade
+    seed_hypervisor_host_configure = kayobe.cli.commands:SeedHypervisorHostConfigure
+    seed_hypervisor_host_upgrade = kayobe.cli.commands:SeedHypervisorHostUpgrade
+    seed_service_deploy = kayobe.cli.commands:SeedServiceDeploy
+    seed_vm_deprovision = kayobe.cli.commands:SeedVMDeprovision
+    seed_vm_provision = kayobe.cli.commands:SeedVMProvision
+
 [build_sphinx]
 all-files = 1
 source-dir = doc/source
diff --git a/setup.py b/setup.py
index 0c33d9db8..8577899d1 100644
--- a/setup.py
+++ b/setup.py
@@ -7,89 +7,23 @@
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-#!/usr/bin/env python
-
-from setuptools import setup, find_packages
-
-
-PROJECT = 'kayobe'
-VERSION = '3.1.0'
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
+import setuptools
 
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
 try:
-    long_description = open('README.md', 'rt').read()
-except IOError:
-    long_description = ''
+    import multiprocessing  # noqa
+except ImportError:
+    pass
 
-setup(
-    name=PROJECT,
-    version=VERSION,
-
-    description='OpenStack deployment for scientific computing',
-    long_description=long_description,
-
-    author='StackHPC',
-    author_email='mark@stackhpc.com',
-
-    url='https://github.com/stackhpc/kayobe',
-    download_url='https://github.com/stackhpc/kayobe/tarball/master',
-
-    provides=[],
-    install_requires=open('requirements.txt', 'rt').read().splitlines(),
-
-    namespace_packages=[],
-    packages=find_packages(),
-    include_package_data=True,
-
-    entry_points={
-        'console_scripts': [
-            'kayobe = kayobe.cmd.kayobe:main',
-            'kayobe-vault-password-helper = kayobe.cmd.kayobe_vault_password_helper:main',
-        ],
-        'kayobe.cli': [
-            'baremetal_compute_inspect = kayobe.cli.commands:BaremetalComputeInspect',
-            'baremetal_compute_manage = kayobe.cli.commands:BaremetalComputeManage',
-            'baremetal_compute_provide = kayobe.cli.commands:BaremetalComputeProvide',
-            'control_host_bootstrap = kayobe.cli.commands:ControlHostBootstrap',
-            'control_host_upgrade = kayobe.cli.commands:ControlHostUpgrade',
-            'configuration_dump = kayobe.cli.commands:ConfigurationDump',
-            'kolla_ansible_run = kayobe.cli.commands:KollaAnsibleRun',
-            'network_connectivity_check = kayobe.cli.commands:NetworkConnectivityCheck',
-            'overcloud_bios_raid_configure = kayobe.cli.commands:OvercloudBIOSRAIDConfigure',
-            'overcloud_container_image_build = kayobe.cli.commands:OvercloudContainerImageBuild',
-            'overcloud_container_image_pull = kayobe.cli.commands:OvercloudContainerImagePull',
-            'overcloud_deployment_image_build = kayobe.cli.commands:OvercloudDeploymentImageBuild',
-            'overcloud_deprovision = kayobe.cli.commands:OvercloudDeprovision',
-            'overcloud_hardware_inspect = kayobe.cli.commands:OvercloudHardwareInspect',
-            'overcloud_host_configure = kayobe.cli.commands:OvercloudHostConfigure',
-            'overcloud_host_upgrade = kayobe.cli.commands:OvercloudHostUpgrade',
-            'overcloud_introspection_data_save = kayobe.cli.commands:OvercloudIntrospectionDataSave',
-            'overcloud_inventory_discover = kayobe.cli.commands:OvercloudInventoryDiscover',
-            'overcloud_post_configure = kayobe.cli.commands:OvercloudPostConfigure',
-            'overcloud_provision = kayobe.cli.commands:OvercloudProvision',
-            'overcloud_service_configuration save = kayobe.cli.commands:OvercloudServiceConfigurationSave',
-            'overcloud_service_configuration generate = kayobe.cli.commands:OvercloudServiceConfigurationGenerate',
-            'overcloud_service_deploy = kayobe.cli.commands:OvercloudServiceDeploy',
-            'overcloud_service_destroy = kayobe.cli.commands:OvercloudServiceDestroy',
-            'overcloud_service_reconfigure = kayobe.cli.commands:OvercloudServiceReconfigure',
-            'overcloud_service_upgrade = kayobe.cli.commands:OvercloudServiceUpgrade',
-            'physical_network_configure = kayobe.cli.commands:PhysicalNetworkConfigure',
-            'playbook_run = kayobe.cli.commands:PlaybookRun',
-            'seed_container_image_build = kayobe.cli.commands:SeedContainerImageBuild',
-            'seed_deployment_image_build = kayobe.cli.commands:SeedDeploymentImageBuild',
-            'seed_host_configure = kayobe.cli.commands:SeedHostConfigure',
-            'seed_host_upgrade = kayobe.cli.commands:SeedHostUpgrade',
-            'seed_hypervisor_host_configure = kayobe.cli.commands:SeedHypervisorHostConfigure',
-            'seed_hypervisor_host_upgrade = kayobe.cli.commands:SeedHypervisorHostUpgrade',
-            'seed_service_deploy = kayobe.cli.commands:SeedServiceDeploy',
-            'seed_vm_deprovision = kayobe.cli.commands:SeedVMDeprovision',
-            'seed_vm_provision = kayobe.cli.commands:SeedVMProvision',
-        ],
-    },
-
-    zip_safe=False,
-)
+setuptools.setup(
+    setup_requires=['pbr'],
+    pbr=True)