diff --git a/.gitignore b/.gitignore
index 0f83df1..ce2c8cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/smc-tools-1.0.0.tar.gz
-/smc-tools-1.1.0.tar.gz
-/smc-tools-1.2.0.tar.gz
-/smc-tools-1.3.1.tar.gz
-/smc-tools-1.5.0.tar.gz
+/smc-tools-*.tar.gz
diff --git a/smc-tools.spec b/smc-tools.spec
index d60785d..4e86079 100644
--- a/smc-tools.spec
+++ b/smc-tools.spec
@@ -1,17 +1,12 @@
 Name:           smc-tools
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Shared Memory Communication Tools
 
 License:        EPL
 URL:            https://github.com/ibm-s390-linux/smc-tools
 Source0:        https://github.com/ibm-s390-linux/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
-# https://github.com/ibm-s390-linux/smc-tools/commit/c3d1f45abff2433afefaea9d31cd9cda0a7408d3
-Patch0:         smc-tools-1.5.0-makefile.patch
-# https://github.com/ibm-s390-linux/smc-tools/issues/1
-Patch1:         smc-tools-1.5.0-flags.patch
-
 BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  libnl3-devel
@@ -33,7 +28,8 @@ sockets in Linux.
 
 
 %build
-%make_build CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" V=1
+%set_build_flags
+%make_build
 
 
 %install
@@ -66,6 +62,11 @@ sockets in Linux.
 
 
 %changelog
+* Wed Jul 07 2021 Čestmír Kalina <ckalina@redhat.com> - 1.6.0-1
+- Resolves: #1869550 Upgrade smc-tools to latest version
+- Related: #1869743
+- Related: #1869747
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.0-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
diff --git a/sources b/sources
index 579bfda..02c6f3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (smc-tools-1.5.0.tar.gz) = 3e28b4084308332ee60dc7f412a56e630cb72fbb5033e0bf4a21bccaed434c33b9e6720358bb614fba6d9513d3225d7df91d62523a6d27eadc80191700c7d78b
+SHA512 (smc-tools-1.6.0.tar.gz) = 8df94698b0d5b5d9148b1c2501c278cee6ff620b1845ab5c3ada465a449f0d928dd324aa67f033a48d5cfd359ea22363e2569a3b6d8aa471f36622078a7c7d23