diff --git a/requirements.txt b/requirements.txt
index 66f184717..f9ddc5c50 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5.16,<0.6
+pbr>=0.5.21,<1.0
 # Horizon Core Requirements
 django>=1.4,<1.6
 django_compressor>=1.3
diff --git a/setup.py b/setup.py
index da4979400..c0a24eab2 100755
--- a/setup.py
+++ b/setup.py
@@ -14,15 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from distutils.command import install
 import setuptools
 
-# Tell distutils not to put the data_files in platform-specific installation
-# locations. See here for an explanation:
-# https://groups.google.com/forum/#!topic/comp.lang.python/Nex7L-026uw
-for scheme in install.INSTALL_SCHEMES.values():
-    scheme['data'] = scheme['purelib']
-
 setuptools.setup(
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
-    d2to1=True)
+    setup_requires=['pbr'],
+    pbr=True)