diff --git a/.gitignore b/.gitignore
index a3b6274..4d1bf2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /oslo.log-3.2.0.tar.gz
 /oslo.log-3.16.0.tar.gz
 /oslo.log-3.20.1.tar.gz
+/oslo.log-3.30.0.tar.gz
diff --git a/python-oslo-log.spec b/python-oslo-log.spec
index 1ea8489..aafab4a 100644
--- a/python-oslo-log.spec
+++ b/python-oslo-log.spec
@@ -8,8 +8,8 @@
 %global pkg_name oslo-log
 
 Name:           python-oslo-log
-Version:        3.20.1
-Release:        2%{?dist}
+Version:        3.30.0
+Release:        1%{?dist}
 Summary:        OpenStack Oslo Log library
 
 License:        ASL 2.0
@@ -23,6 +23,7 @@ Summary:        OpenStack Oslo Log library
 
 BuildRequires:  python2-devel
 BuildRequires:  python-pbr
+BuildRequires:  git
 # Required for tests
 BuildRequires:  python-dateutil
 BuildRequires:  python-mock
@@ -41,12 +42,12 @@ Requires:       python-babel
 Requires:       python-dateutil
 Requires:       python-monotonic
 Requires:       python-six >= 1.9.0
-Requires:       python-oslo-config >= 2:3.14.0
-Requires:       python-oslo-context >= 2.9.0
+Requires:       python-oslo-config >= 2:4.0.0
+Requires:       python-oslo-context >= 2.14.0
 Requires:       python-oslo-i18n >= 2.1.0
-Requires:       python-oslo-utils >= 3.18.0
+Requires:       python-oslo-utils >= 3.20.0
 Requires:       python-oslo-serialization >= 1.10.0
-Requires:       python-debtcollector
+Requires:       python-debtcollector >= 1.2.0
 Requires:       python-inotify
 Requires:       python-%{pkg_name}-lang = %{version}-%{release}
 
@@ -59,7 +60,7 @@ support for context specific logging (like resource id’s etc).
 Summary:    Documentation for the Oslo Log handling library
 
 BuildRequires:  python-sphinx
-BuildRequires:  python-oslo-sphinx
+BuildRequires:  python-openstackdocstheme
 BuildRequires:  python-oslo-config
 BuildRequires:  python-oslo-utils
 BuildRequires:  python-oslo-context
@@ -73,7 +74,7 @@ Summary:    Tests for the Oslo Log handling library
 Requires:       python-%{pkg_name} = %{version}-%{release}
 Requires:       python-mock
 Requires:       python-oslotest
-Requires:       python-oslo-config
+Requires:       python-oslo-config >= 2:4.0.0
 Requires:       python-subunit
 Requires:       python-testrepository
 Requires:       python-testscenarios
@@ -89,7 +90,7 @@ Summary:    Tests for the Oslo Log handling library
 Requires:       python3-%{pkg_name} = %{version}-%{release}
 Requires:       python3-mock
 Requires:       python3-oslotest
-Requires:       python3-oslo-config
+Requires:       python3-oslo-config >= 2:4.0.0
 Requires:       python3-subunit
 Requires:       python3-testrepository
 Requires:       python3-testscenarios
@@ -122,10 +123,10 @@ Requires:       python3-babel
 Requires:       python3-dateutil
 Requires:       python3-monotonic
 Requires:       python3-six >= 1.9.0
-Requires:       python3-oslo-config >= 2:3.14.0
-Requires:       python3-oslo-context >= 2.9.0
+Requires:       python3-oslo-config >= 2:4.0.0
+Requires:       python3-oslo-context >= 2.14.0
 Requires:       python3-oslo-i18n >= 2.1.0
-Requires:       python3-oslo-utils >= 3.18.0
+Requires:       python3-oslo-utils >= 3.20.0
 Requires:       python3-oslo-serialization >= 1.10.0
 Requires:       python3-debtcollector
 Requires:       python3-inotify
@@ -149,7 +150,7 @@ Summary:   Translation files for Oslo log library
 Translation files for Oslo log library
 
 %prep
-%setup -q -n %{pypi_name}-%{upstream_version}
+%autosetup -n %{pypi_name}-%{upstream_version} -S git
 # Let RPM handle the dependencies
 rm -rf {test-,}requirements.txt
 
@@ -160,9 +161,9 @@ rm -rf {test-,}requirements.txt
 %endif
 
 # generate html docs
-PYTHONPATH=. sphinx-build doc/source html
+# %{__python2} setup.py build_sphinx -b html
 # remove the sphinx-build leftovers
-rm -rf html/.{doctrees,buildinfo}
+# rm -rf doc/build/html/.{doctrees,buildinfo}
 # Generate i18n files
 %{__python2} setup.py compile_catalog -d build/lib/oslo_log/locale
 
@@ -208,7 +209,7 @@ rm -rf .testrepository
 %exclude %{python2_sitelib}/oslo_log/tests
 
 %files -n python-%{pkg_name}-doc
-%doc html
+# %doc doc/build/html
 %license LICENSE
 
 %files -n python2-%{pkg_name}-tests
@@ -235,12 +236,6 @@ rm -rf .testrepository
 
 
 %changelog
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Mar 16 2017 Alfredo Moralejo <amoralej@redhat.com> 3.20.1-1
-- Update to 3.20.1
-
-* Wed Feb 08 2017 Alfredo Moralejo <amoralej@redhat.com> 3.20.0-1
-- Update to 3.20.0
+* Fri Aug 11 2017 Alfredo Moralejo <amoralej@redhat.com> 3.30.0-1
+- Update to 3.30.0
 
diff --git a/sources b/sources
index 9f678a2..488b6e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (oslo.log-3.20.1.tar.gz) = 9f802251177a8a822f5944729ac226e226cf7dbe94b9d5b4e5eedb7c64f6968a35810cc288b774085f16f77eaffabf752636bc51c52d50e87cc2840b76076f13
+SHA512 (oslo.log-3.30.0.tar.gz) = bdfd1ea1e8995b986c252680c26fd7be31ad820532f84fab893758782321be326ce32d063f1e413aaa4609f84fa15de18a0b460bb7c90954567f7a386ef9ff20