diff --git a/AUTHORS b/AUTHORS
index bb934ce..f45afdc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,16 +1,6 @@
-PROJECT COORDINATOR:
-François Rossigneux	<francois.rossigneux@inria.fr>
-
-MAIN DEVELOPERS:
-François Rossigneux	<francois.rossigneux@inria.fr>
-
-CONTRIBUTORS:
-Jean-Patrick Gelas  <jpgelas@ens-lyon.fr>
-Laurent Lefèvre     <laurent.lefevre@inria.fr>
-
-PLUGINS MAINTAINERS:
-RRD graph builder	: Jean-Patrick Gelas <jpgelas@ens-lyon.fr>
-WTT file logging	: Jean-Patrick Gelas <jpgelas@ens-lyon.fr>
-	
-
-FORMER MAINTAINER:
+Andreas Jaeger <aj@suse.com>
+François Rossigneux <francois.rossigneux@inria.fr>
+Jeremy Stanley <fungi@yuggoth.org>
+Julien Danjou <julien@danjou.info>
+Swann Croiset <swann.croiset@bull.net>
+venkatamahesh <venkatamaheshkotha@gmail.com>
diff --git a/other-requirements.txt b/other-requirements.txt
new file mode 100644
index 0000000..03641cf
--- /dev/null
+++ b/other-requirements.txt
@@ -0,0 +1,18 @@
+# This is a cross-platform list tracking distribution packages needed by tests;
+# see http://docs.openstack.org/infra/bindep/ for additional information.
+
+build-essential [platform:dpkg]
+curl
+gawk
+groff
+language-pack-en [platform:ubuntu]
+libffi-dev [platform:dpkg]
+libffi-devel [platform:rpm]
+librrd-dev [platform:dpkg]
+libselinux-python [platform:rpm]
+libuuid-devel [platform:rpm]
+locales [platform:debian]
+python-dev [platform:dpkg]
+python-devel [platform:rpm]
+rrdtool-devel [platform:rpm]
+uuid-dev [platform:dpkg]
diff --git a/requirements.txt b/requirements.txt
index 23ce986..53ccdbb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ flask
 iso8601
 kombu
 oslo.config
-pbr>=0.5,<0.6
+pbr>=1.6
 pyserial
 pysnmp
 python-keystoneclient
diff --git a/setup.py b/setup.py
index f914160..66d079b 100755
--- a/setup.py
+++ b/setup.py
@@ -18,5 +18,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
+    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=1.8'],
     d2to1=True)
diff --git a/tox.ini b/tox.ini
index 1d5f107..cee89bf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,3 +4,11 @@ envlist = pep8
 [testenv:pep8]
 deps = pep8==1.4
 commands = pep8 --show-source kwapi setup.py
+
+[testenv:bindep]
+# Do not install any requirements. We want this to be fast and work even if
+# system dependencies are missing, since it's used to tell you what system
+# dependencies are missing! This also means that bindep must be installed
+# separately, outside of the requirements files.
+deps = bindep
+commands = bindep test