diff --git a/.gitignore b/.gitignore
index cf5a117..ea79379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/jwt-go-5ca8014.tar.gz
+/jwt-go-d2709f9.tar.gz
diff --git a/golang-github-dgrijalva-jwt-go.spec b/golang-github-dgrijalva-jwt-go.spec
index 4529a9e..d73b715 100644
--- a/golang-github-dgrijalva-jwt-go.spec
+++ b/golang-github-dgrijalva-jwt-go.spec
@@ -1,16 +1,27 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
+# If any of the following macros should be set otherwise,
+# you can wrap any of them with the following conditions:
+# - %%if 0%%{centos} == 7
+# - %%if 0%%{?rhel} == 7
+# - %%if 0%%{?fedora} == 23
+# Or just test for particular distribution:
+# - %%if 0%%{centos}
+# - %%if 0%%{?rhel}
+# - %%if 0%%{?fedora}
+#
+# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
+# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
+# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
+
+# Generate devel rpm
 %global with_devel 1
+# Build project from bundled dependencies
 %global with_bundled 0
+# Build with debug info rpm
 %global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
+# Run tests in check section
 %global with_check 0
-%global with_unit_test 0
-%endif
+# Generate unit-test rpm
+%global with_unit_test 1
 
 %if 0%{?with_debug}
 %global _dwz_low_mem_die_limit 0
@@ -25,12 +36,12 @@
 # https://github.com/dgrijalva/jwt-go
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          5ca80149b9d3f8b863af0e2bb6742e608603bd99
+%global commit          d2709f9f1f31ebcda9651b03077758c1f3a0018c
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           golang-%{provider}-%{project}-%{repo}
 Version:        2.2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Golang implementation of JSON Web Tokens (JWT)
 License:        MIT
 URL:            https://%{provider_prefix}
@@ -150,6 +161,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %endif
 
 %changelog
+* Thu Sep 21 2017 Jan Chaloupka <jchaloup@redhat.com> - 2.2.0-8
+- Bump to upstream d2709f9f1f31ebcda9651b03077758c1f3a0018c
+  resolves: #1494131
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index ef7bcf9..546d02d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66308a7e4dbaf50d75c3b9f64948a210  jwt-go-5ca8014.tar.gz
+SHA512 (jwt-go-d2709f9.tar.gz) = 12a26fd70674394fe5dc64695314d85c08370d134c8af0d8047363938c90c23f40e0f8f8b25e9288c40bdb28513cfe64fac738a6e557f5425531d7dac01586e8