diff --git a/_service b/_service
index caa2372..3400bb9 100644
--- a/_service
+++ b/_service
@@ -1,8 +1,8 @@
 <services>
   <service mode="disabled" name="renderspec">
-    <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/openstack/oslo.concurrency/oslo.concurrency.spec.j2</param>
+    <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/openstack/oslo.concurrency/oslo.concurrency.spec.j2</param>
     <param name="output-name">python-oslo.concurrency.spec</param>
-    <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/global-requirements.txt</param>
+    <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/global-requirements.txt</param>
     <param name="changelog-email">cloud-devel@suse.de</param>
     <param name="changelog-provider">gh,openstack,oslo.concurrency</param>
   </service>
diff --git a/oslo.concurrency-3.18.0.tar.gz b/oslo.concurrency-3.18.0.tar.gz
deleted file mode 100644
index 5f359ce..0000000
--- a/oslo.concurrency-3.18.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49d56f2250e167ee03e3a4255d7b6086f93badd2a826e36d60324b91798c3980
-size 46670
diff --git a/oslo.concurrency-3.21.0.tar.gz b/oslo.concurrency-3.21.0.tar.gz
new file mode 100644
index 0000000..5b51e32
--- /dev/null
+++ b/oslo.concurrency-3.21.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:732e53c37d349a97ea70bd4f31336de26de316453d956210e5cb0015cbc51abb
+size 47353
diff --git a/python-oslo.concurrency.changes b/python-oslo.concurrency.changes
index a7eb72c..367e084 100644
--- a/python-oslo.concurrency.changes
+++ b/python-oslo.concurrency.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Aug  7 13:37:37 UTC 2017 - cloud-devel@suse.de
+
+- update to version 3.21.0
+  - Imported Translations from Zanata
+  - Remove log translations
+  - turn on warning-is-error for sphinx
+  - Check reStructuredText documents for common style issues
+  - Using fixtures.MockPatch instead of mockpatch.Patch
+  - [Fix gate]Update test requirement
+  - Update URLs in documents according to document migration
+  - Remove support for py34
+  - rearrange existing documentation to follow the new layout standard
+  - pbr.version.VersionInfo needs package name (oslo.xyz and not oslo_xyz)
+  - Update reno for stable/ocata
+  - Check for SubprocessError by name on Python 3.x
+  - Updated from global requirements
+  - switch from oslosphinx to openstackdocstheme
+
 -------------------------------------------------------------------
 Mon Feb 13 09:02:28 UTC 2017 - cloud-devel@suse.de
 
diff --git a/python-oslo.concurrency.spec b/python-oslo.concurrency.spec
index beb3e0b..24284f6 100644
--- a/python-oslo.concurrency.spec
+++ b/python-oslo.concurrency.spec
@@ -18,7 +18,7 @@
 
 %global sname oslo.concurrency
 Name:           python-oslo.concurrency
-Version:        3.18.0
+Version:        3.21.0
 Release:        0
 Summary:        OpenStack oslo.concurrency library
 License:        Apache-2.0
@@ -33,20 +33,20 @@ BuildRequires:  python-fasteners >= 0.7
 BuildRequires:  python-fixtures >= 3.0.0
 BuildRequires:  python-futures >= 3.0
 BuildRequires:  python-mock >= 2.0
-BuildRequires:  python-oslo.config >= 3.14.0
+BuildRequires:  python-oslo.config >= 4.0.0
 BuildRequires:  python-oslo.i18n >= 2.1.0
-BuildRequires:  python-oslo.utils >= 3.18.0
+BuildRequires:  python-oslo.utils >= 3.20.0
 BuildRequires:  python-oslotest >= 1.10.0
-BuildRequires:  python-pbr >= 1.8
+BuildRequires:  python-pbr >= 2.0.0
 BuildRequires:  python-testrepository >= 0.0.18
 BuildRequires:  python-testscenarios >= 0.4
 BuildRequires:  python-testtools >= 1.4.0
 Requires:       python-enum34
 Requires:       python-fasteners >= 0.7
 Requires:       python-iso8601 >= 0.1.11
-Requires:       python-oslo.config >= 3.14.0
+Requires:       python-oslo.config >= 4.0.0
 Requires:       python-oslo.i18n >= 2.1.0
-Requires:       python-oslo.utils >= 3.18.0
+Requires:       python-oslo.utils >= 3.20.0
 Requires:       python-retrying >= 1.2.3
 Requires:       python-six >= 1.9.0
 BuildArch:      noarch
@@ -60,7 +60,7 @@ external processes.
 Summary:        Documentation for OpenStack concurrency library
 Group:          Development/Languages/Python
 BuildRequires:  python-Sphinx
-BuildRequires:  python-oslosphinx >= 4.7.0
+BuildRequires:  python-openstackdocstheme >= 1.11.0
 
 %description doc
 The oslo.concurrency library has utilities for safely running multi-thread,
@@ -71,6 +71,7 @@ This package contains the documentation.
 %prep
 %autosetup -n %{sname}-%{version}
 %py_req_cleanup
+sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 
 %build
 %{py2_build}