diff --git a/.gitignore b/.gitignore
index 5b4582d..2c6ea55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cli-6011f16.tar.gz
+/cli-61f519f.tar.gz
diff --git a/golang-github-urfave-cli.spec b/golang-github-urfave-cli.spec
index 1ac35b6..0ec6ef1 100644
--- a/golang-github-urfave-cli.spec
+++ b/golang-github-urfave-cli.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
+# Run tests in check section
 %global with_check 1
+# Generate unit-test rpm
 %global with_unit_test 1
-%else
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%endif
 
 %if 0%{?with_debug}
 %global _dwz_low_mem_die_limit 0
@@ -18,7 +29,6 @@
 %global debug_package   %{nil}
 %endif
 
-
 %global provider        github
 %global provider_tld    com
 %global project         urfave
@@ -26,12 +36,12 @@
 # https://github.com/urfave/cli
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          6011f165dc288c72abd8acd7722f837c5c64198d
+%global commit          61f519fe5e57c2518c03627b194899a105838eba
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           golang-%{provider}-%{project}-%{repo}
-Version:        1.17.0
-Release:        0.2.git%{shortcommit}%{?dist}
+Version:        1.18.0
+Release:        0.1.git%{shortcommit}%{?dist}
 Summary:        A simple, fast, and fun package for building command line apps in Go
 # Detected licences
 # - MIT/X11 (BSD like) at 'LICENSE'
@@ -40,7 +50,7 @@ URL:            https://%{provider_prefix}
 Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
 
 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch:  %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
+ExclusiveArch:  %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 
@@ -56,9 +66,11 @@ BuildArch:     noarch
 
 %if 0%{?with_check} && ! 0%{?with_bundled}
 BuildRequires: golang(gopkg.in/yaml.v2)
+BuildRequires: golang(github.com/BurntSushi/toml)
 %endif
 
 Requires:      golang(gopkg.in/yaml.v2)
+Requires:      golang(github.com/BurntSushi/toml)
 
 Provides:      golang(%{import_path}) = %{version}-%{release}
 Provides:      golang(%{import_path}/altsrc) = %{version}-%{release}
@@ -150,7 +162,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %endif
 
 %gotest %{import_path}
-%gotest %{import_path}/altsrc
+#i%%gotest %{import_path}/altsrc
 %endif
 
 #define license tag if not already defined
@@ -167,13 +179,17 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %if 0%{?with_unit_test} && 0%{?with_devel}
 %files unit-test-devel -f unit-test-devel.file-list
 %license LICENSE
-%doc CHANGELOG.md README.md
 %endif
 
 %changelog
+* Wed Jan 18 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.18.0-0.1.git61f519f
+- Bump to upstream 61f519fe5e57c2518c03627b194899a105838eba
+  related: #1354378
+
 * Wed Jul 27 2016 jchaloup <jchaloup@redhat.com> - 1.17.0-0.2.git6011f16
 - enable devel and unit-test for epel7
   related: #1354378 
+
 * Mon Jul 11 2016 jchaloup <jchaloup@redhat.com> - 0-0.1.git6011f16
 - First package for Fedora
   resolves: #1354378 
diff --git a/sources b/sources
index 56b34e5..6538d13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33bba72641a72c7d4aaf49b08e63978e  cli-6011f16.tar.gz
+SHA512 (cli-61f519f.tar.gz) = 4c56671e59539fd3b8e9d1c107ee27d2bfce3dacb06c66ab486f822a383bc001be0f0840d7caab5f225203ceb40fe93c50e216c75879aefc7ef8b3f2234a6c76