diff --git a/0001-Don-t-raise-exception-on-missing-man-pages.patch b/0001-Don-t-raise-exception-on-missing-man-pages.patch
new file mode 100644
index 0000000..98185af
--- /dev/null
+++ b/0001-Don-t-raise-exception-on-missing-man-pages.patch
@@ -0,0 +1,52 @@
+From ced8cb601dcc6613c295000060c96b82b389e119 Mon Sep 17 00:00:00 2001
+From: Dirk Mueller <dirk@dmllr.de>
+Date: Wed, 21 Dec 2016 23:29:52 +0100
+Subject: [PATCH] Don't raise exception on missing man pages
+
+The revert in Ia6cfbfe5b10a5b714fbb9f21ca61380aaf231638 actually
+broke Sphinx 1.3.x support again. Try to fix it for real this
+time by avoiding an exception on missing man_pages.
+
+NOTE(dmllr): don't change dict while iterating over it, hopefully
+this fixes the gating failure with python 3.5.x
+
+Change-Id: I52d45fa0a0d42de690d3a492068f7bb03483a224
+Related-Bug: 1379998
+(cherry picked from commit 9fd7aa2cc7fe50f68bd9c86c3db7a8f7ae710c05)
+---
+ pbr/builddoc.py | 3 ++-
+ pbr/util.py     | 4 +++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/pbr/builddoc.py b/pbr/builddoc.py
+index b0da309..8061fbf 100644
+--- a/pbr/builddoc.py
++++ b/pbr/builddoc.py
+@@ -138,7 +138,8 @@ class LocalBuildDoc(setup_command.BuildDoc):
+             sphinx_config.init_values(warnings.warn)
+         else:
+             sphinx_config.init_values()
+-        if self.builder == 'man' and len(sphinx_config.man_pages) == 0:
++        if self.builder == 'man' and len(
++                getattr(sphinx_config, 'man_pages', '')) == 0:
+             return
+         app = application.Sphinx(
+             self.source_dir, self.config_dir,
+diff --git a/pbr/util.py b/pbr/util.py
+index daad138..cb50a90 100644
+--- a/pbr/util.py
++++ b/pbr/util.py
+@@ -211,7 +211,9 @@ def cfg_to_args(path='setup.cfg', script_args=()):
+     parser.read(path)
+     config = {}
+     for section in parser.sections():
+-        config[section] = dict(parser.items(section))
++        config[section] = dict()
++        for k, value in parser.items(section):
++            config[section][k.replace('-', '_')] = value
+ 
+     # Run setup_hooks, if configured
+     setup_hooks = has_get_option(config, 'global', 'setup_hooks')
+-- 
+2.9.3
+
diff --git a/python-pbr.spec b/python-pbr.spec
index 03c3bd9..c23f500 100644
--- a/python-pbr.spec
+++ b/python-pbr.spec
@@ -11,13 +11,16 @@
 
 Name:           python-%{pypi_name}
 Version:        1.10.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python Build Reasonableness
 
 License:        ASL 2.0
 URL:            http://pypi.python.org/pypi/pbr
 Source0:        https://pypi.io/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 
+# not in a released version yet https://review.openstack.org/413795
+Patch0001:      0001-Don-t-raise-exception-on-missing-man-pages.patch
+
 BuildArch:      noarch
 
 
@@ -68,6 +71,8 @@ Manage dynamic plugins for Python applications
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
+%patch0001 -p1
+
 rm -rf {test-,}requirements.txt pbr.egg-info/requires.txt
 
 %if 0%{?with_python3}
@@ -124,6 +129,9 @@ rm -rf %{buildroot}%{python_sitelib}/pbr/tests
 %endif
 
 %changelog
+* Sat Feb 18 2017 Alan Pevec <apevec AT redhat.com> - 1.10.0-4
+- Fix newer Sphinx and Python 3.5 support LP#1379998
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild