diff --git a/setup.cfg b/setup.cfg
index 85bafbd8b..bab794f33 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -97,8 +97,11 @@ cover-inclusive = true
 ; detailed-errors = 1
 
 
-[pbr]
-warnerrors = True
+# NOTE(flaper87): Disable until the next pbr release to avoid breaking the gate
+# by unexpected errors. More info at:
+# http://lists.openstack.org/pipermail/openstack-dev/2016-June/097849.html
+# [pbr]
+# warnerrors = true
 
 [compile_catalog]
 directory = zaqar/locale